Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 8238:f795d24aebc3
localrepo: fixed typos in comments
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 28 Apr 2009 18:29:50 +0200 |
| parents | 46293a0c7e9f |
| children | f802b4706a53 |
comparison
equal
deleted
inserted
replaced
| 8237:1320459daa91 | 8238:f795d24aebc3 |
|---|---|
| 1066 if fixup: | 1066 if fixup: |
| 1067 wlock = None | 1067 wlock = None |
| 1068 try: | 1068 try: |
| 1069 try: | 1069 try: |
| 1070 # updating the dirstate is optional | 1070 # updating the dirstate is optional |
| 1071 # so we dont wait on the lock | 1071 # so we don't wait on the lock |
| 1072 wlock = self.wlock(False) | 1072 wlock = self.wlock(False) |
| 1073 for f in fixup: | 1073 for f in fixup: |
| 1074 self.dirstate.normal(f) | 1074 self.dirstate.normal(f) |
| 1075 except error.LockError: | 1075 except error.LockError: |
| 1076 pass | 1076 pass |
| 1806 # Remember the revision we hope to see next. | 1806 # Remember the revision we hope to see next. |
| 1807 next_rev[0] = r + 1 | 1807 next_rev[0] = r + 1 |
| 1808 return collect_msng_filenodes | 1808 return collect_msng_filenodes |
| 1809 | 1809 |
| 1810 # We have a list of filenodes we think we need for a file, lets remove | 1810 # We have a list of filenodes we think we need for a file, lets remove |
| 1811 # all those we now the recipient must have. | 1811 # all those we know the recipient must have. |
| 1812 def prune_filenodes(f, filerevlog): | 1812 def prune_filenodes(f, filerevlog): |
| 1813 msngset = msng_filenode_set[f] | 1813 msngset = msng_filenode_set[f] |
| 1814 hasset = {} | 1814 hasset = {} |
| 1815 # If a 'missing' filenode thinks it belongs to a changenode we | 1815 # If a 'missing' filenode thinks it belongs to a changenode we |
| 1816 # assume the recipient must have, then the recipient must have | 1816 # assume the recipient must have, then the recipient must have |