TakUnity avatar TakUnity committed a246b02

evolve: extract evolve --any implementation into a function.

Comments (0)

Files changed (1)

 
     contopt = opts['continue']
     anyopt = opts['any']
+    dryrunopt = opts['dry_run']
 
     if contopt:
         if anyopt:
         graftcmd = commands.table['graft'][0]
         return graftcmd(ui, repo, old_obsolete=True, **{'continue': True})
 
+    return _evolveany(ui, repo, anyopt, dryrunopt)
+
+def _evolveany(ui, repo, anyopt, dryrunopt):
     tr = _picknexttroubled(ui, repo, anyopt)
     if tr is None:
         troubled = repo.revs('troubled()')
     cmdutil.bailifchanged(repo)
     troubles = tr.troubles()
     if 'unstable' in troubles:
-        return _solveunstable(ui, repo, tr, opts['dry_run'])
+        return _solveunstable(ui, repo, tr, dryrunopt)
     elif 'bumped' in troubles:
-        return _solvebumped(ui, repo, tr, opts['dry_run'])
+        return _solvebumped(ui, repo, tr, dryrunopt)
     elif 'divergent' in troubles:
         repo = repo.unfiltered()
         tr = repo[tr.rev()]
-        return _solvedivergent(ui, repo, tr, opts['dry_run'])
+        return _solvedivergent(ui, repo, tr, dryrunopt)
     else:
         assert False  # WHAT? unknown troubles
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.