Mercurial > hg
comparison hgext/largefiles/reposetup.py @ 15789:2c10ea43c801
largefiles: Fix parser warning: redefinition of unused 'node' from line 14
author | Levi Bard <levi@unity3d.com> |
---|---|
date | Sun, 08 Jan 2012 11:23:21 +0100 |
parents | 927712d9853b |
children | 3ef07ecdb0d5 |
comparison
equal
deleted
inserted
replaced
15788:07b6af9076b4 | 15789:2c10ea43c801 |
---|---|
9 '''setup for largefiles repositories: reposetup''' | 9 '''setup for largefiles repositories: reposetup''' |
10 import copy | 10 import copy |
11 import types | 11 import types |
12 import os | 12 import os |
13 | 13 |
14 from mercurial import context, error, manifest, match as match_, node, util | 14 from mercurial import context, error, manifest, match as match_, util |
15 from mercurial import node as node_ | |
15 from mercurial.i18n import _ | 16 from mercurial.i18n import _ |
16 | 17 |
17 import lfcommands | 18 import lfcommands |
18 import proto | 19 import proto |
19 import lfutil | 20 import lfutil |
405 if o: | 406 if o: |
406 toupload = set() | 407 toupload = set() |
407 o = repo.changelog.nodesbetween(o, revs)[0] | 408 o = repo.changelog.nodesbetween(o, revs)[0] |
408 for n in o: | 409 for n in o: |
409 parents = [p for p in repo.changelog.parents(n) | 410 parents = [p for p in repo.changelog.parents(n) |
410 if p != node.nullid] | 411 if p != node_.nullid] |
411 ctx = repo[n] | 412 ctx = repo[n] |
412 files = set(ctx.files()) | 413 files = set(ctx.files()) |
413 if len(parents) == 2: | 414 if len(parents) == 2: |
414 mc = ctx.manifest() | 415 mc = ctx.manifest() |
415 mp1 = ctx.parents()[0].manifest() | 416 mp1 = ctx.parents()[0].manifest() |