Patrick Mezard
91d2df2c77
Merge with crew-stable
2008-04-12 21:34:01 +02:00
Patrick Mezard
3409e6fdc3
context: handle untracked files in filectx.fileflags()
2008-04-12 21:08:03 +02:00
Paul Moore
0046a32c4b
python 2.6 compatibility: add __hash__ to classes that have __eq__
2008-04-04 22:41:17 +02:00
Alexis S. L. Carvalho
dd492604df
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
...
_repopath may be different from _path for workingfilectx when there
are renames involved.
2008-03-16 06:10:47 -03:00
Matt Mackall
865487e7f2
revlog: report node and file when lookup fails
2008-03-11 17:42:29 -05:00
Joel Rosdahl
4f8012378a
Remove unused imports
2008-03-06 22:23:41 +01:00
Joel Rosdahl
5dae3059a0
Expand import * to allow Pyflakes to find problems
2008-03-06 22:23:26 +01:00
Thomas Arendsen Hein
deb94bc7fe
Removed trailing spaces from everything except test output
2008-03-07 00:24:36 +01:00
Patrick Mezard
4b9a547de4
context: fix filectx.parents() bug introduced when editing 3fb82bcfc6e3
2008-01-06 15:40:32 +01:00
Maxim Dounin
4d9877b4eb
Fix copies reporting in log and convert.
...
If copy logged in file revision, we report copy for changeset only
if file revisions linkrev points back to the changeset in question
or both changeset parents contain different file revisions.
This fixes extra copies reported when executable bit was changed for
previously copied file.
2007-12-29 17:11:48 +03:00
Maxim Dounin
940a0afd31
context: preserve changeset in filectx if we have one
...
If we know original changeset we are working with - try hard to
preserve it. Fallback to filelog.linkrev() only if we have no way
to get original changeset, since linkrev() may point to other
changeset.
2007-12-29 16:57:43 +03:00
Thomas Arendsen Hein
347da85c36
Removed tabs and trailing whitespace in python files
2007-12-29 19:49:48 +01:00
Bryan O'Sullivan
d32d6fb57f
make LookupError more detailed
2007-11-28 08:36:55 -08:00
Bryan O'Sullivan
2a0ef5ab06
Fix context iterator.
2007-11-02 14:44:33 -07:00
Bryan O'Sullivan
6df62fb77c
convert: make contents of "extra" dict available from sources, for sinks.
...
This breaks hash preservation for hg->hg conversion, as each converted
change gets a convert_revision item added to its extra dict. Ugh.
2007-10-10 15:30:00 -07:00
Patrick Mezard
2dee2a1086
Fix workingctx exec/link bit of copies on non-supporting systems
2007-10-07 15:07:35 +02:00
Patrick Mezard
8102777e5e
Fix bad lambda prototype in workingctx.fileflags()
2007-10-06 17:54:33 +02:00
Patrick Mezard
904ffeda9f
context: add fileflags() to avoid rebuilding manifests
2007-10-05 23:01:38 +02:00
Matt Mackall
410e8d67c6
context: add __contains__, __getitem__, and __iter__
2007-07-21 16:02:09 -05:00
Matt Mackall
642976187f
contexts: improve filectx eq test
2007-07-16 17:39:03 -05:00
FUJIWARA Katsunori
03774e057f
Allow filectx.annotate to return the line number of first appearance.
2007-07-08 19:46:04 +02:00
Matt Mackall
cfe7a0a522
merge: make test for fast-forward merge stricter (issue619)
...
don't allow merging with an ancestor
fix != on contexts
add a test
2007-07-05 13:34:18 -05:00
Matt Mackall
7be33e5057
context: add tags() method
2007-06-21 11:42:39 -05:00
Patrick Mezard
0b90ff3d83
Merge with crew-stable
2007-06-20 00:22:51 +02:00
Patrick Mezard
aae84719a5
Fix issue 589: "undelete" sequence leads to crash.
2007-06-20 00:10:21 +02:00
Thomas Arendsen Hein
4d29c6dc8e
Updated copyright notices and add "and others" to "hg version"
2007-06-19 08:51:34 +02:00
Matt Mackall
5fa7270b2d
Merge with stable
2007-05-08 11:42:48 -05:00
Matt Mackall
d4deb74aa1
context: fix workingfilectx._changectx
2007-05-07 22:30:36 -05:00
Matt Mackall
e896adead6
Merge with -stable, fix small test failure
2007-03-14 01:26:09 -05:00
Matt Mackall
c2bb73121f
Move branch read/write to dirstate where it belongs
2007-03-13 18:50:02 -05:00
Matt Mackall
19d825d10e
Minor default branch cleanups
2007-03-13 15:47:55 -05:00
Alexis S. L. Carvalho
fd69fe8d91
"default" is the default branch name
2007-03-13 15:02:33 -03:00
Thomas Arendsen Hein
d104165f50
Use only integer part of mtime in workingfilectx.date(), fixes test-context.py
...
Similar to what is done in dirstate.status() (changeset db96436edaee)
and has to be removed when Mercurial switches to subsecond granularity.
2007-02-26 21:57:33 +01:00
Thomas Arendsen Hein
c20f16ea94
Fixed workingfilectx.date() (found by Thomas Waldmann) with test.
2007-02-23 17:31:00 +01:00
Matt Mackall
2e27ddd82b
symlinks: use is_link wherever is_exec is used
2006-12-29 20:04:31 -06:00
Matt Mackall
b875ad6c04
exec: add execfunc to simplify exec flag support on non-exec filesystems
2006-12-29 20:04:30 -06:00
Benoit Boissinot
35f1d19852
context: create a filectxt with filelog reuse
2006-12-25 18:57:55 +01:00
Benoit Boissinot
a8be9617b4
context: fix a bug in workingfilectx.renamed
2006-12-25 17:43:47 +01:00
Benoit Boissinot
6b47271f10
make it possible to use changectx to create a filectx
2006-12-25 17:43:44 +01:00
Benoit Boissinot
36bf020419
add date attribute to workingfilectx
2006-12-24 22:55:34 +01:00
Benoit Boissinot
6c61f6a933
fix tab vs space
2006-12-24 22:29:29 +01:00
Brendan Cully
8a6eea2483
Add revlog.LookupError exception, and use it instead of RevlogError.
...
Remove repo.LookupError, which devolves to the revlog version.
2006-12-18 12:22:43 -08:00
Matt Mackall
296d6a7cb8
Simplify i18n imports
2006-12-14 20:25:19 -06:00
Matt Mackall
f17a4e1934
Replace demandload with new demandimport
2006-12-13 13:27:09 -06:00
Matt Mackall
6148417831
context: don't spuriously raise abort when a file goes missing.
2006-12-08 13:14:57 -06:00
Brendan Cully
261404dfe1
Make context __eq__ handle arbitrary RHS values
2006-11-27 15:27:09 -08:00
Benoit Boissinot
97597496aa
context: None is not a valid filenode (revert from ae31fe77b54b)
2006-11-27 20:55:50 +01:00
Thomas Arendsen Hein
411d64ce3e
white space and line break cleanups
2006-11-17 08:06:54 +01:00
Thomas Arendsen Hein
687e4a7111
Define and use nullrev (revision of nullid) instead of -1.
2006-10-29 10:53:51 +01:00
Matt Mackall
e8cb00b8c7
filecontext: report False for missing files
2006-10-18 14:06:48 -05:00
