Show More
@@ -80,12 +80,12 b' cmdtable = {}' | |||||
80 | command = cmdutil.command(cmdtable) |
|
80 | command = cmdutil.command(cmdtable) | |
81 | testedwith = 'internal' |
|
81 | testedwith = 'internal' | |
82 |
|
82 | |||
83 | # force load strip extension formely included in mq and import some utility |
|
83 | # force load strip extension formerly included in mq and import some utility | |
84 | try: |
|
84 | try: | |
85 | stripext = extensions.find('strip') |
|
85 | stripext = extensions.find('strip') | |
86 | except KeyError: |
|
86 | except KeyError: | |
87 | # note: load is lazy so we could avoid the try-except, |
|
87 | # note: load is lazy so we could avoid the try-except, | |
88 |
# but I (marmoute) prefer this explicit |
|
88 | # but I (marmoute) prefer this explicit code. | |
89 | class dummyui(object): |
|
89 | class dummyui(object): | |
90 | def debug(self, msg): |
|
90 | def debug(self, msg): | |
91 | pass |
|
91 | pass | |
@@ -651,7 +651,7 b' class queue(object):' | |||||
651 | """return the mq handled parent or p1 |
|
651 | """return the mq handled parent or p1 | |
652 |
|
652 | |||
653 | In some case where mq get himself in being the parent of a merge the |
|
653 | In some case where mq get himself in being the parent of a merge the | |
654 |
|
|
654 | appropriate parent may be p2. | |
655 | (eg: an in progress merge started with mq disabled) |
|
655 | (eg: an in progress merge started with mq disabled) | |
656 |
|
656 | |||
657 | If no parent are managed by mq, p1 is returned. |
|
657 | If no parent are managed by mq, p1 is returned. |
@@ -636,7 +636,7 b' def restorestatus(repo):' | |||||
636 | raise util.Abort(_('no rebase in progress')) |
|
636 | raise util.Abort(_('no rebase in progress')) | |
637 |
|
637 | |||
638 | def inrebase(repo, originalwd, state): |
|
638 | def inrebase(repo, originalwd, state): | |
639 | '''check whether the workdir is in an interrupted rebase''' |
|
639 | '''check whether the working dir is in an interrupted rebase''' | |
640 | parents = [p.rev() for p in repo.parents()] |
|
640 | parents = [p.rev() for p in repo.parents()] | |
641 | if originalwd in parents: |
|
641 | if originalwd in parents: | |
642 | return True |
|
642 | return True |
@@ -190,7 +190,7 b' def createcmd(ui, repo, pats, opts):' | |||||
190 | lock = repo.lock() |
|
190 | lock = repo.lock() | |
191 |
|
191 | |||
192 | bms = repo._bookmarks.copy() |
|
192 | bms = repo._bookmarks.copy() | |
193 | # use an uncommited transaction to generate the bundle to avoid |
|
193 | # use an uncommitted transaction to generate the bundle to avoid | |
194 | # pull races. ensure we don't print the abort message to stderr. |
|
194 | # pull races. ensure we don't print the abort message to stderr. | |
195 | tr = repo.transaction('commit', report=lambda x: None) |
|
195 | tr = repo.transaction('commit', report=lambda x: None) | |
196 |
|
196 |
@@ -533,7 +533,7 b' def transplant(ui, repo, *revs, **opts):' | |||||
533 | --source/-s specifies another repository to use for selecting changesets, |
|
533 | --source/-s specifies another repository to use for selecting changesets, | |
534 | just as if it temporarily had been pulled. |
|
534 | just as if it temporarily had been pulled. | |
535 | If --branch/-b is specified, these revisions will be used as |
|
535 | If --branch/-b is specified, these revisions will be used as | |
536 | heads when deciding which changsets to transplant, just as if only |
|
536 | heads when deciding which changesets to transplant, just as if only | |
537 | these revisions had been pulled. |
|
537 | these revisions had been pulled. | |
538 | If --all/-a is specified, all the revisions up to the heads specified |
|
538 | If --all/-a is specified, all the revisions up to the heads specified | |
539 | with --branch will be transplanted. |
|
539 | with --branch will be transplanted. |
@@ -312,5 +312,5 b' def validdest(repo, old, new):' | |||||
312 | elif repo.obsstore: |
|
312 | elif repo.obsstore: | |
313 | return new.node() in obsolete.foreground(repo, [old.node()]) |
|
313 | return new.node() in obsolete.foreground(repo, [old.node()]) | |
314 | else: |
|
314 | else: | |
315 |
# still an independ |
|
315 | # still an independent clause as it is lazyer (and therefore faster) | |
316 | return old.descendant(new) |
|
316 | return old.descendant(new) |
@@ -197,7 +197,7 b' class basectx(object):' | |||||
197 |
|
197 | |||
198 | class changectx(basectx): |
|
198 | class changectx(basectx): | |
199 | """A changecontext object makes access to data related to a particular |
|
199 | """A changecontext object makes access to data related to a particular | |
200 | changeset convenient. It represents a read-only context already presnt in |
|
200 | changeset convenient. It represents a read-only context already present in | |
201 | the repo.""" |
|
201 | the repo.""" | |
202 | def __init__(self, repo, changeid=''): |
|
202 | def __init__(self, repo, changeid=''): | |
203 | """changeid is a revision number, node, or tag""" |
|
203 | """changeid is a revision number, node, or tag""" |
@@ -22,7 +22,7 b' def ismember(ui, username, userlist):' | |||||
22 | """Check if username is a member of userlist. |
|
22 | """Check if username is a member of userlist. | |
23 |
|
23 | |||
24 | If userlist has a single '*' member, all users are considered members. |
|
24 | If userlist has a single '*' member, all users are considered members. | |
25 | Can be overriden by extensions to provide more complex authorization |
|
25 | Can be overridden by extensions to provide more complex authorization | |
26 | schemes. |
|
26 | schemes. | |
27 | """ |
|
27 | """ | |
28 | return userlist == ['*'] or username in userlist |
|
28 | return userlist == ['*'] or username in userlist |
@@ -161,7 +161,7 b' def _search(web, req, tmpl):' | |||||
161 | ctx = web.repo[query] |
|
161 | ctx = web.repo[query] | |
162 | except (error.RepoError, error.LookupError): |
|
162 | except (error.RepoError, error.LookupError): | |
163 | # query is not an exact revision pointer, need to |
|
163 | # query is not an exact revision pointer, need to | |
164 | # decide if it's a revset expession or keywords |
|
164 | # decide if it's a revset expression or keywords | |
165 | pass |
|
165 | pass | |
166 | else: |
|
166 | else: | |
167 | return MODE_REVISION, ctx |
|
167 | return MODE_REVISION, ctx |
@@ -725,7 +725,7 b' def update(repo, node, branchmerge, forc' | |||||
725 | repo.hook('update', parent1=xp2, parent2='', error=0) |
|
725 | repo.hook('update', parent1=xp2, parent2='', error=0) | |
726 | return 0, 0, 0, 0 |
|
726 | return 0, 0, 0, 0 | |
727 |
|
727 | |||
728 | if pa not in (p1, p2): # nolinear |
|
728 | if pa not in (p1, p2): # nonlinear | |
729 | dirty = wc.dirty(missing=True) |
|
729 | dirty = wc.dirty(missing=True) | |
730 | if dirty or onode is None: |
|
730 | if dirty or onode is None: | |
731 | # Branching is a bit strange to ensure we do the minimal |
|
731 | # Branching is a bit strange to ensure we do the minimal |
@@ -373,7 +373,7 b' def pushmarker(repo, key, old, new):' | |||||
373 | def syncpush(repo, remote): |
|
373 | def syncpush(repo, remote): | |
374 | """utility function to push obsolete markers to a remote |
|
374 | """utility function to push obsolete markers to a remote | |
375 |
|
375 | |||
376 |
Exist mostly to allow overrid |
|
376 | Exist mostly to allow overriding for experimentation purpose""" | |
377 | if (_enabled and repo.obsstore and |
|
377 | if (_enabled and repo.obsstore and | |
378 | 'obsolete' in remote.listkeys('namespaces')): |
|
378 | 'obsolete' in remote.listkeys('namespaces')): | |
379 | rslts = [] |
|
379 | rslts = [] | |
@@ -393,7 +393,7 b' def syncpull(repo, remote, gettransactio' | |||||
393 | one if necessary. We return the transaction to inform the calling code that |
|
393 | one if necessary. We return the transaction to inform the calling code that | |
394 | a new transaction have been created (when applicable). |
|
394 | a new transaction have been created (when applicable). | |
395 |
|
395 | |||
396 |
Exists mostly to allow overrid |
|
396 | Exists mostly to allow overriding for experimentation purpose""" | |
397 | tr = None |
|
397 | tr = None | |
398 | if _enabled: |
|
398 | if _enabled: | |
399 | repo.ui.debug('fetching remote obsolete markers\n') |
|
399 | repo.ui.debug('fetching remote obsolete markers\n') | |
@@ -446,10 +446,10 b' def foreground(repo, nodes):' | |||||
446 | """return all nodes in the "foreground" of other node |
|
446 | """return all nodes in the "foreground" of other node | |
447 |
|
447 | |||
448 | The foreground of a revision is anything reachable using parent -> children |
|
448 | The foreground of a revision is anything reachable using parent -> children | |
449 |
or precursor -> sucessor relation. It is very similar |
|
449 | or precursor -> successor relation. It is very similar to "descendant" but | |
450 | augmented with obsolescence information. |
|
450 | augmented with obsolescence information. | |
451 |
|
451 | |||
452 |
Beware that possible obsolescence cycle may result if complex |
|
452 | Beware that possible obsolescence cycle may result if complex situation. | |
453 | """ |
|
453 | """ | |
454 | repo = repo.unfiltered() |
|
454 | repo = repo.unfiltered() | |
455 | foreground = set(repo.set('%ln::', nodes)) |
|
455 | foreground = set(repo.set('%ln::', nodes)) |
@@ -267,12 +267,12 b' class phasecache(object):' | |||||
267 | if filtered: |
|
267 | if filtered: | |
268 | self.dirty = True |
|
268 | self.dirty = True | |
269 | # filterunknown is called by repo.destroyed, we may have no changes in |
|
269 | # filterunknown is called by repo.destroyed, we may have no changes in | |
270 |
# root but phaserevs contents is certainly invalid |
|
270 | # root but phaserevs contents is certainly invalid (or at least we | |
271 | # have not proper way to check that. related to issue 3858. |
|
271 | # have not proper way to check that). related to issue 3858. | |
272 | # |
|
272 | # | |
273 | # The other caller is __init__ that have no _phaserevs initialized |
|
273 | # The other caller is __init__ that have no _phaserevs initialized | |
274 | # anyway. If this change we should consider adding a dedicated |
|
274 | # anyway. If this change we should consider adding a dedicated | |
275 |
# "destroyed" function to phasecache or a proper cache key mechanism |
|
275 | # "destroyed" function to phasecache or a proper cache key mechanism | |
276 | # (see branchmap one) |
|
276 | # (see branchmap one) | |
277 | self._phaserevs = None |
|
277 | self._phaserevs = None | |
278 |
|
278 |
@@ -283,7 +283,7 b' class propertycache(object):' | |||||
283 | return result |
|
283 | return result | |
284 |
|
284 | |||
285 | def cachevalue(self, obj, value): |
|
285 | def cachevalue(self, obj, value): | |
286 | # __dict__ assigment required to bypass __setattr__ (eg: repoview) |
|
286 | # __dict__ assignment required to bypass __setattr__ (eg: repoview) | |
287 | obj.__dict__[self.name] = value |
|
287 | obj.__dict__[self.name] = value | |
288 |
|
288 | |||
289 | def pipefilter(s, cmd): |
|
289 | def pipefilter(s, cmd): |
@@ -1,6 +1,6 b'' | |||||
1 | """test behavior of propertycache and unfiltered propertycache |
|
1 | """test behavior of propertycache and unfiltered propertycache | |
2 |
|
2 | |||
3 |
The repoview overlay is quite complex |
|
3 | The repoview overlay is quite complex. We test the behavior of | |
4 | property cache of both localrepo and repoview to prevent |
|
4 | property cache of both localrepo and repoview to prevent | |
5 | regression.""" |
|
5 | regression.""" | |
6 |
|
6 |
@@ -386,7 +386,7 b' applied patches after stripping ancestor' | |||||
386 |
|
386 | |||
387 | $ hg qapplied |
|
387 | $ hg qapplied | |
388 |
|
388 | |||
389 | Verify strip protects against stripping wc parent when there are uncommited mods |
|
389 | Verify strip protects against stripping wc parent when there are uncommitted mods | |
390 |
|
390 | |||
391 | $ echo b > b |
|
391 | $ echo b > b | |
392 | $ hg add b |
|
392 | $ hg add b |
General Comments 0
You need to be logged in to leave comments.
Login now