Commits

Graham Helliwell  committed afe81cd

Fix up merge issues (mainly indentation)

  • Participants
  • Parent commits 11e61a0
  • Branches Download

Comments (0)

Files changed (2)

File guestrepo/__init__.py

     mercurial repository.
 '''
 
-from guestrepo import pull, push, grupdate, freeze, summary, state, grout, grin
+from guestrepo import grpull, grpush, grupdate, freeze, summary, state, grout, grin
 from guestrepo import colortable
 
 import convert
 # See the readme for a description of each command
 # format: {"command-name": (function, options-list, help-string)}
 cmdtable = {
-   "grpull": (pull,
+   "grpull": (grpull,
               localopt + threadopt
               + [('u', 'update', False, "grupdate after grpull")],
               "hg grpull [REPO [+]] [options]"),
-   "grpush": (push,
+   "grpush": (grpush,
               localopt + threadopt
               + [('', 'new-branch', False, "create new branches if necessary"),
                  ('', 'frozen', False, "only revision specified in grstate"),

File guestrepo/guestrepo.py

         return 0
 
 @warn_uncomitted_config
-def push(ui, repo, *args, **opts):
+def grpush(ui, repo, *args, **opts):
     '''
     Push each guest to the path specified in the mapping file.
 
         return 0
 
 @warn_uncomitted_config
-def pull(ui, repo, *args, **opts):
+def grpull(ui, repo, *args, **opts):
     '''pull  guest repos
 
     Pull each guest repo from the location specified in the mapping file.
                 raise
 
 
-    guests = []
-    if not skip:
-        pathauditor = pathutil.pathauditor(repo.root)
-        for configpath, value in guestconfig[''].items():
-        try:
-           canonpath = pathutil.canonpath(repo.root,
-                                          repo.root,
-                                          configpath,
-                                          auditor = pathauditor)
-        except util.Abort:
-               canonpath = authorizedoutisderoot(os.path.join(repo.root, configpath))
+	guests = []
+	if not skip:
+		pathauditor = pathutil.pathauditor(repo.root)
+		for configpath, value in guestconfig[''].items():
+			try:
+			   canonpath = pathutil.canonpath(repo.root,
+											  repo.root,
+											  configpath,
+											  auditor = pathauditor)
+			except util.Abort:
+				canonpath = authorizedoutisderoot(os.path.join(repo.root, configpath))
 
-            if canonpath == '':
-                raise util.Abort("guest path '%s' refers to parent repository!" %
-                                    configpath)
+				if canonpath == '':
+					raise util.Abort("guest path '%s' refers to parent repository!" % configpath)
 
-            # parse the name, csid pair
-            split = value.rsplit(' ', 1)
-            name = split[0].rstrip(' ')
-            if len( split ) != 2:
-                raise util.Abort("guest at path '%s' has no changeset identifier" %
-                                    configpath)
-            csid = split[1]
+			# parse the name, csid pair
+			split = value.rsplit(' ', 1)
+			name = split[0].rstrip(' ')
+			if len( split ) != 2:
+				raise util.Abort("guest at path '%s' has no changeset identifier" %
+								configpath)
+			csid = split[1]
 
-            root = os.path.join(repo.root, canonpath)
+			root = os.path.join(repo.root, canonpath)
 
-            guests.append(guestrepo(name, configpath, canonpath, None, csid, root))
+			guests.append(guestrepo(name, configpath, canonpath, None, csid, root))
 
-        rejectnestedguests(guests)
+		rejectnestedguests(guests)
 
     return guests