Show More
@@ -1149,7 +1149,8 b' def overridepurge(orig, ui, repo, *dirs,' | |||||
1149 | modified, added, removed, deleted, unknown, ignored, clean = r |
|
1149 | modified, added, removed, deleted, unknown, ignored, clean = r | |
1150 | unknown = [f for f in unknown if lfdirstate[f] == '?'] |
|
1150 | unknown = [f for f in unknown if lfdirstate[f] == '?'] | |
1151 | ignored = [f for f in ignored if lfdirstate[f] == '?'] |
|
1151 | ignored = [f for f in ignored if lfdirstate[f] == '?'] | |
1152 |
return modified, added, removed, deleted, |
|
1152 | return scmutil.status(modified, added, removed, deleted, | |
|
1153 | unknown, ignored, clean) | |||
1153 | repo.status = overridestatus |
|
1154 | repo.status = overridestatus | |
1154 | orig(ui, repo, *dirs, **opts) |
|
1155 | orig(ui, repo, *dirs, **opts) | |
1155 | repo.status = oldstatus |
|
1156 | repo.status = oldstatus |
@@ -12,7 +12,7 b' import os' | |||||
12 |
|
12 | |||
13 | from mercurial import error, manifest, match as match_, util |
|
13 | from mercurial import error, manifest, match as match_, util | |
14 | from mercurial.i18n import _ |
|
14 | from mercurial.i18n import _ | |
15 | from mercurial import localrepo |
|
15 | from mercurial import localrepo, scmutil | |
16 |
|
16 | |||
17 | import lfcommands |
|
17 | import lfcommands | |
18 | import lfutil |
|
18 | import lfutil | |
@@ -242,7 +242,7 b' def reposetup(ui, repo):' | |||||
242 | wlock.release() |
|
242 | wlock.release() | |
243 |
|
243 | |||
244 | self.lfstatus = True |
|
244 | self.lfstatus = True | |
245 | return result |
|
245 | return scmutil.status(*result) | |
246 |
|
246 | |||
247 | # As part of committing, copy all of the largefiles into the |
|
247 | # As part of committing, copy all of the largefiles into the | |
248 | # cache. |
|
248 | # cache. |
@@ -341,7 +341,7 b' class basectx(object):' | |||||
341 | l.sort() |
|
341 | l.sort() | |
342 |
|
342 | |||
343 | # we return a tuple to signify that this list isn't changing |
|
343 | # we return a tuple to signify that this list isn't changing | |
344 |
return |
|
344 | return scmutil.status(*r) | |
345 |
|
345 | |||
346 |
|
346 | |||
347 | def makememctx(repo, parents, text, user, date, branch, files, store, |
|
347 | def makememctx(repo, parents, text, user, date, branch, files, store, | |
@@ -1482,7 +1482,7 b' class workingctx(committablectx):' | |||||
1482 | # (s[1] is 'added' and s[2] is 'removed') |
|
1482 | # (s[1] is 'added' and s[2] is 'removed') | |
1483 | s = list(s) |
|
1483 | s = list(s) | |
1484 | s[1], s[2] = s[2], s[1] |
|
1484 | s[1], s[2] = s[2], s[1] | |
1485 |
return |
|
1485 | return scmutil.status(*s) | |
1486 |
|
1486 | |||
1487 | class committablefilectx(basefilectx): |
|
1487 | class committablefilectx(basefilectx): | |
1488 | """A committablefilectx provides common functionality for a file context |
|
1488 | """A committablefilectx provides common functionality for a file context |
@@ -9,7 +9,7 b' import errno, os, re, shutil, posixpath,' | |||||
9 | import xml.dom.minidom |
|
9 | import xml.dom.minidom | |
10 | import stat, subprocess, tarfile |
|
10 | import stat, subprocess, tarfile | |
11 | from i18n import _ |
|
11 | from i18n import _ | |
12 | import config, util, node, error, cmdutil, match as matchmod |
|
12 | import config, util, node, error, cmdutil, scmutil, match as matchmod | |
13 | import phases |
|
13 | import phases | |
14 | import pathutil |
|
14 | import pathutil | |
15 | import exchange |
|
15 | import exchange | |
@@ -448,7 +448,7 b' class abstractsubrepo(object):' | |||||
448 | return 1 |
|
448 | return 1 | |
449 |
|
449 | |||
450 | def status(self, rev2, **opts): |
|
450 | def status(self, rev2, **opts): | |
451 | return [], [], [], [], [], [], [] |
|
451 | return scmutil.status([], [], [], [], [], [], []) | |
452 |
|
452 | |||
453 | def diff(self, ui, diffopts, node2, match, prefix, **opts): |
|
453 | def diff(self, ui, diffopts, node2, match, prefix, **opts): | |
454 | pass |
|
454 | pass | |
@@ -650,7 +650,7 b' class hgsubrepo(abstractsubrepo):' | |||||
650 | except error.RepoLookupError, inst: |
|
650 | except error.RepoLookupError, inst: | |
651 | self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n') |
|
651 | self._repo.ui.warn(_('warning: error "%s" in subrepository "%s"\n') | |
652 | % (inst, subrelpath(self))) |
|
652 | % (inst, subrelpath(self))) | |
653 | return [], [], [], [], [], [], [] |
|
653 | return scmutil.status([], [], [], [], [], [], []) | |
654 |
|
654 | |||
655 | @annotatesubrepoerror |
|
655 | @annotatesubrepoerror | |
656 | def diff(self, ui, diffopts, node2, match, prefix, **opts): |
|
656 | def diff(self, ui, diffopts, node2, match, prefix, **opts): | |
@@ -1583,7 +1583,8 b' class gitsubrepo(abstractsubrepo):' | |||||
1583 | removed.append(f) |
|
1583 | removed.append(f) | |
1584 |
|
1584 | |||
1585 | deleted = unknown = ignored = clean = [] |
|
1585 | deleted = unknown = ignored = clean = [] | |
1586 |
return modified, added, removed, deleted, |
|
1586 | return scmutil.status(modified, added, removed, deleted, | |
|
1587 | unknown, ignored, clean) | |||
1587 |
|
1588 | |||
1588 | def shortid(self, revid): |
|
1589 | def shortid(self, revid): | |
1589 | return revid[:7] |
|
1590 | return revid[:7] |
@@ -2,7 +2,7 b' workingfilectx.date = (1000, 0)' | |||||
2 | ASCII : Gr?ezi! |
|
2 | ASCII : Gr?ezi! | |
3 | Latin-1 : Gr�ezi! |
|
3 | Latin-1 : Gr�ezi! | |
4 | UTF-8 : Grüezi! |
|
4 | UTF-8 : Grüezi! | |
5 | (['foo'], [], [], [], [], [], []) |
|
5 | <status modified=['foo'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]> | |
6 | diff --git a/foo b/foo |
|
6 | diff --git a/foo b/foo | |
7 |
|
7 | |||
8 | --- a/foo |
|
8 | --- a/foo |
General Comments 0
You need to be logged in to leave comments.
Login now