[PATCH stable] keyword: use status' names instead of index
Martin Geisler
mg at lazybytes.net
Sat Feb 20 13:22:41 CST 2010
Christian Ebert <blacktrash at gmx.net> writes:
> # HG changeset patch
> # User Christian Ebert <blacktrash at gmx.net>
> # Date 1266656494 -3600
> # Branch stable
> # Node ID 26420b79576e5d302987e7633423b187568c635b
> # Parent 98bc3e195720bd80193d8017ea88fff6d474d44c
> keyword: use status' names instead of index
This does not really fix anything, right? So it's not for stable, but
should go in via the default branch instead.
> diff --git a/hgext/keyword.py b/hgext/keyword.py
> --- a/hgext/keyword.py
> +++ b/hgext/keyword.py
> @@ -265,14 +265,14 @@
> raise util.Abort(_('outstanding uncommitted merge'))
> kwt = kwtools['templater']
> status = _status(ui, repo, kwt, *pats, **opts)
> - modified, added, removed, deleted = status[:4]
> + modified, added, removed, deleted, unknown, ignored, clean = status
> if modified or added or removed or deleted:
> raise util.Abort(_('outstanding uncommitted changes'))
> wlock = lock = None
> try:
> wlock = repo.wlock()
> lock = repo.lock()
> - kwt.overwrite(None, expand, status[6])
> + kwt.overwrite(None, expand, clean)
> finally:
> release(lock, wlock)
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
--
Martin Geisler
VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20100220/b83c5445/attachment.pgp>
More information about the Mercurial-devel
mailing list