Benoit Boissinot
0e56ff2f66
localrepo: factor commit and rawcommit
...
note: rawcommit with an empty text will now launch the editor
2006-11-07 21:43:19 +01:00
Benoit Boissinot
e8fd91f783
localrepo.commit: little cleanups
...
- use a list for new fileids
- sort the removed files
2006-11-07 21:43:15 +01:00
Thomas Arendsen Hein
687e4a7111
Define and use nullrev (revision of nullid) instead of -1.
2006-10-29 10:53:51 +01:00
Alexis S. L. Carvalho
17f016acd0
Correct optimization from 56bc6966622e; add a test.
...
If there are two (or more) heads that point to the same .hgtags
node, we can safely skip parsing the file in all but the last head.
(In 56bc6966622e, we were parsing the file in the first head and
skipping all the others.)
2006-10-28 23:37:59 -03:00
Thomas Arendsen Hein
11cdc6b21b
Merge with upstream
2006-10-27 23:09:46 +02:00
Matt Mackall
5186d07f32
improve walk docstrings
2006-10-27 11:24:10 -05:00
Thomas Arendsen Hein
a0477d89a5
New UnexpectedOutput exception to catch server errors in localrepo.stream_in
...
If the unexpected is a string, the empty string will be mentioned, and long
strings are cut to at most 400 chars.
2006-10-27 18:17:12 +02:00
Thomas Arendsen Hein
47d731406a
Show number (-v) and list (--debug) of changesets with bundle/pull/push etc.
2006-10-25 18:45:18 +02:00
Brendan Cully
45cd7b7440
Merge with mpm
2006-10-24 13:42:21 -07:00
Matt Mackall
49503fb772
Merge with crew
2006-10-24 13:46:04 -05:00
Alexis S. L. Carvalho
9ede4a440a
Split branchtags into two additional functions.
...
This makes it easier to override only parts of the cache saving process.
2006-10-23 23:32:56 -03:00
Matt Mackall
862620d6bf
localrepo: add separate methods for manipulating repository data
...
This change adds new methods sjoin and sopener for accessing the
following elements:
- changelog
- manifest
- data/
- journal and undo log
- repo lock
This will simplify sharing this data and escaping paths
2006-10-23 17:12:20 -05:00
Benoit Boissinot
3f09dfef56
use xrange instead of range
2006-10-19 14:16:51 +02:00
Matt Mackall
8be8fbef1f
Minor tags optimization
2006-10-18 22:38:23 -05:00
Matt Mackall
aa8e8c430f
Use file contexts in tags code
2006-10-18 14:14:59 -05:00
Matt Mackall
4a6017f8e8
Only look up tags and branches as a last resort
2006-10-18 11:44:56 -05:00
Matt Mackall
007b438590
If we can't write the branch cache, fail quietly.
2006-10-18 10:46:51 -05:00
Benoit Boissinot
2bc50de330
invalidate the branch cache when sanity check fails
2006-10-18 09:26:23 +02:00
Eric Hopper
b804ede3e2
Stop erroring out pull -r and clone -r if repository isn't local.
2006-09-09 18:25:07 -07:00
Matt Mackall
4b6a4d5cb0
Improve branch cache sanity check for mq
2006-10-18 02:08:33 -05:00
Matt Mackall
12537f44dc
commit: read branch with workingctx
2006-10-17 22:26:14 -05:00
Matt Mackall
af917449ea
branchtags: use changectx
...
setting self.branchcache on entry avoids recursions in lookup
2006-10-17 22:09:56 -05:00
Matt Mackall
fd5ffbb139
Add branch support to commit
2006-10-17 18:32:00 -05:00
Matt Mackall
587d11648a
Make lookup aware of branch labels
...
adjust precedence order slightly:
- '.'
- tags
- branch labels
- revlog order
2006-10-17 18:31:56 -05:00
Matt Mackall
fefe69bcd1
Add branchtags function with cache
...
- cache stores tipmost node and rev and node,label pairs
- if cache is out of date, scan new changesets
- write new cache out after scan
2006-10-17 18:31:18 -05:00
Alexis S. L. Carvalho
f0031e0717
rawcommit: add removed files to the changelog file list
...
patch by tonfa.
2006-10-12 19:26:06 -03:00
Alexis S. L. Carvalho
2182538090
ui.py: remove revlogopts and (unused) diffcache variables
...
This should make the [revlog] section in a .hg/hgrc file be respected
when there's still no changelog.
2006-10-10 18:43:20 -03:00
Thomas Arendsen Hein
f8cc3a01a4
merge with upstream
2006-10-10 09:30:05 +02:00
Benoit Boissinot
4e11486432
fix localrepo.status when dealing with x-bit changes
2006-10-10 00:02:30 +02:00
Matt Mackall
88a9662e9f
commit: unify file-level commit code
2006-10-09 14:02:01 -05:00
Matt Mackall
9c3978e6ef
Use filelog.cmp in checkfilemerge
2006-10-08 20:18:59 -05:00
Matt Mackall
ddd540c49d
merge: remember rename copies and parents properly on commit
...
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
2006-10-08 19:57:45 -05:00
Brendan Cully
de0df5a89b
Merge with upstream
2006-10-03 12:14:33 -07:00
Matt Mackall
93a98b345e
merge: use new working context object in update
2006-10-03 01:21:46 -05:00
Thomas Arendsen Hein
0a7b982aa6
Whitespace/Tab cleanup
2006-10-01 19:26:33 +02:00
Matt Mackall
b707245da4
localrepo.parents: return null context for no parents
2006-09-29 15:56:36 -05:00
Matt Mackall
ead8d7c353
Add localrepo.parents to get parent changectxs.
2006-09-29 15:48:16 -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
Thomas Arendsen Hein
3bf23a7d35
If local repository is missing, make error message clearer.
...
Faheem Mitha suggested finding a better error message.
The nice error message is taken from cogito.
2006-09-11 10:08:30 +02:00
Thomas Arendsen Hein
d2082f10fc
Never apply string formatting to generated errors with util.Abort.
...
Otherwise error messages containing % chars yield errors or worse.
Fixed (hopefully) all users of util.Abort.
2006-09-08 09:36:18 +02:00
Benoit Boissinot
4456f11f57
localrepo: move the repo creation code, fail if the repo exists
2006-09-02 23:06:47 +02:00
Benoit Boissinot
5e11bd63c0
fix incorrect warning when walking on a particular rev
...
when a directory was given instead of a file it reported
incorrectly 'No such file or directory in rev <rev>'
we test if the file is a prefix directory
2006-08-28 21:49:02 +02:00
Matt Mackall
4e0e3a1e78
tag: shorten hash in default commit message
...
Move default message to commands.py
Pass node in binary for consistency
Remove default arguments
Fix up tests
2006-08-20 23:52:52 -05:00
Matt Mackall
62b10cb784
Demote a pull note to a debug message
2006-08-20 21:59:51 -05:00
Alexis S. L. Carvalho
ca387842ee
localrepo.status: detect clean files even when the mtime has changed
2006-08-20 00:44:54 -03:00
Matt Mackall
b5a0f2743c
filelog: add hash-based comparisons
...
For status, rather than reconstruct full file versions from revlog for
comparison, compare hashes.
2006-08-14 15:07:00 -05:00
Vadim Gelfer
80d6f2f7c7
remove localrepository.changes.
...
use localrepository.status instead.
2006-08-12 16:40:12 -07:00
Vadim Gelfer
dc377b58c1
update copyrights.
2006-08-12 12:30:02 -07:00
Alexis S. L. Carvalho
219803f060
Fix some bugs introduced during the manifest refactoring
2006-08-12 08:53:23 -03:00
Matt Mackall
5c0d170547
Remove manifest.readflags
2006-08-11 11:00:38 -05:00
