Show More
@@ -11,7 +11,7 b' from i18n import gettext as _' | |||||
11 | demandload(globals(), "os re sys signal imp urllib pdb shlex") |
|
11 | demandload(globals(), "os re sys signal imp urllib pdb shlex") | |
12 | demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo") |
|
12 | demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo") | |
13 | demandload(globals(), "difflib patch tempfile time") |
|
13 | demandload(globals(), "difflib patch tempfile time") | |
14 |
demandload(globals(), "traceback errno version atexit |
|
14 | demandload(globals(), "traceback errno version atexit bz2") | |
15 | demandload(globals(), "archival changegroup cmdutil hgweb.server sshserver") |
|
15 | demandload(globals(), "archival changegroup cmdutil hgweb.server sshserver") | |
16 |
|
16 | |||
17 | class UnknownCommand(Exception): |
|
17 | class UnknownCommand(Exception): | |
@@ -827,24 +827,23 b' def bundle(ui, repo, fname, dest=None, *' | |||||
827 | # create the right base |
|
827 | # create the right base | |
828 | # XXX: nodesbetween / changegroup* should be "fixed" instead |
|
828 | # XXX: nodesbetween / changegroup* should be "fixed" instead | |
829 | o = [] |
|
829 | o = [] | |
830 | has_set = sets.Set(base) |
|
830 | has = {nullid: None} | |
831 | for n in base: |
|
831 | for n in base: | |
832 |
has |
|
832 | has.update(repo.changelog.reachable(n)) | |
833 | if revs: |
|
833 | if revs: | |
834 | visit = list(revs) |
|
834 | visit = list(revs) | |
835 | else: |
|
835 | else: | |
836 | visit = repo.changelog.heads() |
|
836 | visit = repo.changelog.heads() | |
837 |
seen = |
|
837 | seen = {} | |
838 | while visit: |
|
838 | while visit: | |
839 | n = visit.pop(0) |
|
839 | n = visit.pop(0) | |
840 | parents = [p for p in repo.changelog.parents(n) |
|
840 | parents = [p for p in repo.changelog.parents(n) if p not in has] | |
841 | if p != nullid and p not in has_set] |
|
|||
842 | if len(parents) == 0: |
|
841 | if len(parents) == 0: | |
843 | o.insert(0, n) |
|
842 | o.insert(0, n) | |
844 | else: |
|
843 | else: | |
845 | for p in parents: |
|
844 | for p in parents: | |
846 | if p not in seen: |
|
845 | if p not in seen: | |
847 |
seen |
|
846 | seen[p] = 1 | |
848 | visit.append(p) |
|
847 | visit.append(p) | |
849 | else: |
|
848 | else: | |
850 | setremoteconfig(ui, opts) |
|
849 | setremoteconfig(ui, opts) |
General Comments 0
You need to be logged in to leave comments.
Login now