equal
deleted
inserted
replaced
92 mail, |
92 mail, |
93 node as nodemod, |
93 node as nodemod, |
94 patch, |
94 patch, |
95 pycompat, |
95 pycompat, |
96 registrar, |
96 registrar, |
97 repair, |
|
98 scmutil, |
97 scmutil, |
99 templater, |
98 templater, |
100 util, |
99 util, |
101 ) |
100 ) |
102 from mercurial.utils import dateutil |
101 from mercurial.utils import dateutil |
622 raise error.Abort(_('use only one form to specify the revision')) |
621 raise error.Abort(_('use only one form to specify the revision')) |
623 revs = rev |
622 revs = rev |
624 elif bookmark: |
623 elif bookmark: |
625 if bookmark not in repo._bookmarks: |
624 if bookmark not in repo._bookmarks: |
626 raise error.Abort(_("bookmark '%s' not found") % bookmark) |
625 raise error.Abort(_("bookmark '%s' not found") % bookmark) |
627 revs = repair.stripbmrevset(repo, bookmark) |
626 revs = scmutil.bookmarkrevs(repo, bookmark) |
628 |
627 |
629 revs = scmutil.revrange(repo, revs) |
628 revs = scmutil.revrange(repo, revs) |
630 if outgoing: |
629 if outgoing: |
631 revs = _getoutgoing(repo, dest, revs) |
630 revs = _getoutgoing(repo, dest, revs) |
632 if bundle: |
631 if bundle: |