equal
deleted
inserted
replaced
2096 elif 'rev' in opts: |
2096 elif 'rev' in opts: |
2097 revs = scmutil.revrange(repo, opts['rev']) |
2097 revs = scmutil.revrange(repo, opts['rev']) |
2098 else: |
2098 else: |
2099 revs = () |
2099 revs = () |
2100 if not revs: |
2100 if not revs: |
2101 ui.write_err('no revision to fold\n') |
2101 raise util.Abort(_('no revisions specified')) |
2102 return 1 |
|
2103 roots = repo.revs('roots(%ld)', revs) |
2102 roots = repo.revs('roots(%ld)', revs) |
2104 if len(roots) > 1: |
2103 if len(roots) > 1: |
2105 raise util.Abort("set has multiple roots") |
2104 raise util.Abort("set has multiple roots") |
2106 root = repo[roots[0]] |
2105 root = repo[roots[0]] |
2107 if root.phase() <= phases.public: |
2106 if root.phase() <= phases.public: |