Dirkjan Ochtman
3e077a5422
strip trailing whitespace, replace tabs by spaces
2008-08-21 11:35:17 +02:00
Martin Geisler
bf6b9a2dd1
Begin commit messages with two empty lines.
...
This makes editors like Emacs wrap the commit message correctly. With
no empty line between the commit message and the 'HG:' lines, the
'HG:' lines would be wrapped as if they belonged to the commit message
and so lose their significance to Mercurial.
This makes no difference to what is stored by the commit -- whitespace
was already stripped from the beginning and end of commit messages.
2008-03-29 23:05:45 +01:00
Matt Mackall
3a7193d270
streamclone: fold in localrepo.storefiles
2008-08-13 20:18:44 -05:00
Matt Mackall
2793481364
store: change handling of decoding errors
2008-08-13 20:18:43 -05:00
Matt Mackall
7e9e494932
store: take opener as an argument
2008-08-13 20:18:42 -05:00
Matt Mackall
2f3a27a9da
localrepo: simplify requirements checking
2008-08-13 20:18:42 -05:00
Matt Mackall
6cbbb747e5
localrepo: kill _createmode
2008-08-13 20:18:42 -05:00
Stefano Tortarolo
61967725af
make commit fail when committing unresolved files
2008-08-13 20:18:40 -05:00
Dirkjan Ochtman
6b51480caa
merge with crew-stable
2008-08-12 17:47:08 +02:00
Matt Mackall
08b29d9875
Merge with stable
...
Simplify the copy search algorithm
2008-08-10 18:38:43 -05:00
Matt Mackall
4d074f2f87
add a fix for issue 1175
...
If we copy a file followed by an update, it's possible for the parent
manifest to no longer contain the source file of the copy, which could cause
commit to fail. If this happens, we search backwares from the first
parent to find the most likely original revision.
2008-08-10 18:01:03 -05:00
Matt Mackall
879e08f657
commit: simplify file copy logic
2008-08-10 18:01:03 -05:00
Matt Mackall
e03f4e2f73
util: set_flags shouldn't know about repo flag formats
2008-08-10 21:55:06 -05:00
Adrian Buehlmann
904617b7d8
introduce store classes
...
move store walking from streamclone.py into store.py
2008-07-24 16:32:52 +02:00
Adrian Buehlmann
34afc460b4
move filename encoding functions from util.py to new store.py
2008-07-24 16:32:51 +02:00
Matt Mackall
8cb2b4a288
dirstate.walk: push sorting up
2008-07-22 13:03:19 -05:00
Matt Mackall
b4ff221e3e
minor status fixups
2008-07-22 13:00:22 -05:00
Patrick Mezard
ba0d5cdad9
localrepo: fix status() typos from 854b907527e5a and 51f105e04825
2008-07-20 19:09:00 +02:00
Christian Boos
3bad7927f6
localrepo: do not modify a dictionary being iterated in status()
2008-07-18 12:31:40 +02:00
Matt Mackall
75293bf8bd
status: various cleanups
...
- rename lookup to cmp for formatting reasons
- reduce nesting level of fixup code
- sort fixup results
- group comparison cases in a separate clause
- make list initialization simpler
- delay flag lookup for working directory
- sort removed list in comparison
- avoid sorting already sorted lists
2008-07-11 18:46:02 -05:00
Matt Mackall
7157575a82
status: use contexts
2008-07-11 18:46:02 -05:00
Matt Mackall
f1402a6652
context: add walk method
2008-06-27 19:25:48 -05:00
Matt Mackall
a65ef7bc5d
util: add sort helper
2008-06-27 18:28:45 -05:00
Matt Mackall
d4ab55a92b
status: clean up all users for unknown files
2008-06-27 13:43:29 -05:00
Matt Mackall
4382d6c797
dirstate: fold statwalk and walk
2008-06-26 14:35:50 -05:00
Matt Mackall
73c76dd164
repo.status: eliminate list_
2008-06-26 14:35:50 -05:00
Matt Mackall
bc715be859
add __len__ and __iter__ methods to repo and revlog
2008-06-26 14:35:50 -05:00
Matt Mackall
fbb5127472
use repo[changeid] to get a changectx
2008-06-26 14:35:46 -05:00
Matt Mackall
d462e1fc26
simplify flag handling
...
add _checklink var to dirstate
introduce dirstate.flagfunc
switch users of util.execfunc/linkfunc to flagfunc
change manifestdict.set to take a flags string
change ctx.fileflags to ctx.flags
change gitmode func to a dict
remove util.execfunc/linkfunc
2008-06-26 13:46:34 -05:00
Matt Mackall
2bd0fe0371
context: clean up parents()
2008-06-26 13:46:33 -05:00
Matt Mackall
5867ff1667
use repo.changectx(None) to get a workingctx
2008-06-26 13:46:29 -05:00
Matt Mackall
9d556277c8
context: avoid using None for working parent
2008-06-25 17:35:20 -05:00
Matt Mackall
9ab99468a9
lookup: optimize '.'
...
Remove error messages as behavior is documented in hg help revs
2008-06-25 17:33:34 -05:00
Dirkjan Ochtman
8f93fcc6fc
fix default branchheads() argument (69dbb521053b was very broken)
2008-06-25 10:54:48 +02:00
Dirkjan Ochtman
3bd7f09e49
tighter default argument selection in localrepo.branchheads()
2008-06-24 09:36:24 +02:00
Dirkjan Ochtman
0a97daf0e7
get repo.branchheads() to use working directory's branch by default
2008-06-23 15:03:22 +02:00
Dirkjan Ochtman
b5da46f6f1
kill some trailing spaces
2008-06-23 13:12:32 +02:00
Patrick Mezard
1ae4077ddd
context: add memctx for memory commits
2008-06-19 00:14:23 +02:00
Patrick Mezard
0f0fea02fd
localrepo: interpret ctx.filectx() exception as a missing file
2008-06-18 23:23:03 +02:00
Patrick Mezard
da1bc3ab9a
localrepo: do not expose workingctx options
...
These are implementation details and probably of no use to client code.
2008-06-18 23:00:20 +02:00
Patrick Mezard
1d2db00cd1
localrepo: extract _commitctx() from commit()
...
_commitctx() takes a single changectx like argument. It gives way to commits
from memory only.
2008-06-18 22:52:26 +02:00
Patrick Mezard
67c45a2700
context: let workingctx.date(), .user() and description() be overriden
2008-06-18 22:52:26 +02:00
Patrick Mezard
767445bf63
localrepo: let commit() get extra data from workingctx
2008-06-18 22:52:26 +02:00
Patrick Mezard
f2fb1d0609
localrepo: hide commit() file selection behind workingctx
2008-06-18 22:52:25 +02:00
Patrick Mezard
d2d7e18a64
localrepo: replace dirstate by workingfilectx in filecommit()
2008-06-18 22:52:25 +02:00
Patrick Mezard
d184e29b1c
context: let workingctx parents be overriden
2008-06-18 22:52:25 +02:00
Patrick Mezard
1fa87a95fd
Merge with crew-stable
2008-06-15 13:05:39 +02:00
Patrick Mezard
c7f6f81b90
Ignore dummy copies in dirstate and localrepo.filecommit()
2008-06-15 13:01:03 +02:00
Patrick Mezard
626dd9789e
localrepo: remove useless sort() call
2008-06-14 16:01:24 +02:00
Matt Mackall
9861703d4b
tag: record tag we're superseding, if any (issue 1102)
2008-06-13 17:29:10 -05:00
