Preliminary implementation of server-side forking (issue 137)

James Moger

2012-09-29 1e1b85270f93b3bca624c99b478f3a9a23be2395

 src/com/gitblit/ConfigUserService.java

@@ -315,7 +315,10 @@
      } catch (Throwable t) {

         if (originalUser != null) {

            // restore original user

            users.put(originalUser.username, originalUser);

            users.put(originalUser.username.toLowerCase(), originalUser);

         } else {

            // drop attempted add

            users.remove(model.username.toLowerCase());

         }

         logger.error(MessageFormat.format("Failed to update user model {0}!", model.username),

               t);

@@ -514,7 +517,10 @@
      } catch (Throwable t) {

         if (original != null) {

            // restore original team

            teams.put(original.name, original);

            teams.put(original.name.toLowerCase(), original);

         } else {

            // drop attempted add

            teams.remove(model.name.toLowerCase());

         }

         logger.error(MessageFormat.format("Failed to update team model {0}!", model.name), t);

      }

@@ -744,6 +750,9 @@
         if (model.canAdmin) {

            roles.add(Constants.ADMIN_ROLE);

         }

         if (model.canFork) {

            roles.add(Constants.FORK_ROLE);

         }

         if (model.excludeFromFederation) {

            roles.add(Constants.NOT_FEDERATED_ROLE);

         }

@@ -852,6 +861,7 @@
               Set<String> roles = new HashSet<String>(Arrays.asList(config.getStringList(

                     USER, username, ROLE)));

               user.canAdmin = roles.contains(Constants.ADMIN_ROLE);

               user.canFork = roles.contains(Constants.FORK_ROLE);

               user.excludeFromFederation = roles.contains(Constants.NOT_FEDERATED_ROLE);



               // repository memberships