Commit Graph

3133 Commits

Author SHA1 Message Date
Brendan Cully
5e02efd5d4 Make filectx lazier - some users never use filenode 2006-09-22 08:19:25 -07:00
Brendan Cully
684cd993b8 context: handle fileid or changeid == 0 2006-09-22 08:19:25 -07:00
Benoit Boissinot
0681cb2c18 merge with crew 2006-09-22 08:48:56 +02:00
Matt Mackall
7ca6c6f0dd Switch revlog.ancestor to use revisions rather than nodeids 2006-09-21 18:15:44 -05:00
Matt Mackall
f61dd23d9b mpatch: Fix for malloc corner case on AIX 2006-09-21 16:16:39 -05:00
Matt Mackall
2b28f61e9f Merge with crew 2006-09-21 16:15:39 -05:00
Matt Mackall
79aed53c85 Abstract ancestor algorithm into generic function
Make depth calculation non-recursive
Add simple shortcut for linear ancestry

Convert context to use ancestor function
 make memoized parents function

Convert revlog to use ancestor function
2006-09-20 16:50:50 -05:00
Giorgos Keramidas
c6538e557f tests: add new test; test-mq-qrefresh 2006-09-20 21:44:35 +02:00
Matt Mackall
01ca9fd363 Merge with crew 2006-09-19 15:28:13 -05:00
Matt Mackall
0650997740 filectx: add rename-aware ancestor algorithm
This code works but may trigger recursion depth issues
2006-09-19 14:58:54 -05:00
Brendan Cully
7c9528ede7 mq: Add --rev argument to qimport, to adopt existing changesets. 2006-09-19 10:22:30 -07:00
Benoit Boissinot
663bcd49d0 manifest.py: remove unnecessary method 2006-09-20 22:26:47 +02:00
Brendan Cully
2e045795a2 qimport: rename patch to patchname to avoid shadowing module 2006-09-19 08:45:39 -07:00
Matt Mackall
19ce6dc65c changectx: add ancestor function 2006-09-17 22:59:33 -05:00
Matt Mackall
ce81b072ef filectx: allow passing filelog in init to avoid opening new filelogs 2006-09-17 22:58:11 -05:00
Matt Mackall
50e42b8388 filelog: make metadata method private 2006-09-17 22:38:06 -05:00
Matt Mackall
06695a7cb9 filectx: add rename traversal for parents() 2006-09-17 22:20:44 -05:00
Matt Mackall
885b6f1a23 merge: simplify actions with helper function 2006-09-17 21:27:30 -05:00
Matt Mackall
56ee773f9b merge: simplify local created logic 2006-09-17 21:11:26 -05:00
Matt Mackall
3fb7ecf4fc merge: simplify prompt code 2006-09-17 20:43:06 -05:00
Matt Mackall
55f5616f63 merge: simplify exec flag handling 2006-09-17 20:38:02 -05:00
Matt Mackall
e626757894 merge: simplify tests for local changed/remote deleted 2006-09-17 20:18:27 -05:00
Matt Mackall
130870e3b4 merge: more simplification of m2 manifest scanning 2006-09-17 20:10:54 -05:00
Matt Mackall
7b613a7651 merge: reorder tests on m2 items in manifestmerge 2006-09-17 20:00:14 -05:00
Matt Mackall
35d8b2766b merge: eliminate redundant security check
duplicated in applyupdates
2006-09-17 19:54:01 -05:00
Matt Mackall
dbfce7afdf merge: eliminate confusing queued variable 2006-09-17 19:53:19 -05:00
Matt Mackall
57a97bbee9 merge: remove no longer possible clause 2006-09-17 18:28:50 -05:00
Matt Mackall
f974d70a70 merge: move apply and dirstate code into separate functions 2006-09-17 17:39:19 -05:00
Matt Mackall
769045bfdc merge: remove linear variable 2006-09-17 17:13:02 -05:00
Matt Mackall
7a90b4f86c merge: simplify hook code 2006-09-17 17:07:44 -05:00
Matt Mackall
0ef93234ad merge: linear_path -> linear 2006-09-17 16:50:17 -05:00
Matt Mackall
e892404453 merge: pull manifest checks and updates into separate functions 2006-09-17 16:47:33 -05:00
Matt Mackall
404e69c300 merge: remove now unused umap dict 2006-09-17 16:13:34 -05:00
Matt Mackall
d9a7957055 merge: pull manifest comparison out into separate function 2006-09-17 16:13:03 -05:00
Matt Mackall
abd544b718 Merge with mainline 2006-09-17 16:02:09 -05:00
Matt Mackall
c8ac19165e merge: move set_exec to actions 2006-09-17 15:59:59 -05:00
Matt Mackall
1b67b22515 merge: add forget to action list 2006-09-17 15:54:51 -05:00
Matt Mackall
79c61d8eaf merge: add codes to action list, eliminate None elements 2006-09-17 15:24:00 -05:00
Matt Mackall
57ca71b692 merge: convert actions to list 2006-09-17 15:10:56 -05:00
Brendan Cully
8104550ace Move defaultrev into changectx
This also causes tag on a repository with no working directory
to default to tip.
2006-09-15 15:23:52 -07:00
Benoit Boissinot
2caa3e642d fix warnings spotted by pychecker 2006-09-18 17:43:31 +02:00
Benoit Boissinot
5d5586c52d hgweb: fix errors spotted by pychecker 2006-09-18 17:32:28 +02:00
TK Soh
a1ddb8da93 extdiff: use the default option only if the default program is used 2006-09-18 12:01:32 +02:00
Benoit Boissinot
b7569bba8a Merge with mainline 2006-09-18 11:55:38 +02:00
Matt Mackall
d031f12c1d Merge with backout 2006-09-15 16:01:16 -05:00
Matt Mackall
277fde1fea Back out trusted hgrc change for now
Backed out changeset f077d29b114d4
2006-09-15 16:00:16 -05:00
Mathieu Clabaut
3107fb4b9f Update [extdiff] configuration sample for vimdiff,
taking acount cmd.xxx and opts.xxx configurations item.
2006-09-15 22:55:17 +02:00
Matt Mackall
3f3298dd8d Merge with crew 2006-09-15 15:22:45 -05:00
Matt Doar
223e5f58eb Add support for diffstat in commit emails, and move diffstat from
patchbomb to patch
2006-09-13 13:14:08 -07:00
Brendan Cully
2af71f83a1 cat: default to working dir parent instead of tip
This introduces a defaultrev function that chooses
the working dir parent if a revision isn't specified,
and uses it in several places.
2006-09-14 19:24:00 -07:00