Matt Mackall
ba56a1fdbd
Only show long hashes with --debug, not --verbose
2006-08-20 22:51:56 -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
a717a94148
fix typo in mail.py
2006-08-20 02:21:59 -03:00
Alexis S. L. Carvalho
5b03b03561
fix incoming -p
2006-08-20 02:21:51 -03:00
Alexis S. L. Carvalho
d7eab34ed8
dirstate.py: when comparing mtimes, use only the integer part.
...
Python 2.5 can return timestamps with subsecond resolution.
2006-08-20 01:13:11 -03: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
Alexis S. L. Carvalho
2eec163a35
Avoid Python 2.5 warning
...
demandload.py:112: Warning: 'as' will become a reserved keyword in Python 2.6
2006-08-20 00:44:53 -03:00
TK Soh
3f6491c428
extdiff: make new diff commands pick up their options correctly
2006-08-17 15:30:45 -05:00
Vadim Gelfer
f72ee79e69
addremove: add -s/--similarity option
...
progress on issue 295.
2006-08-18 22:13:58 -07:00
Vadim Gelfer
e72a2729a5
fix comment.
2006-08-18 21:18:01 -07:00
Vadim Gelfer
5a993ee589
merge.
2006-08-18 21:17:28 -07:00
Vadim Gelfer
3d22e17326
merge.
2006-08-18 21:04:10 -07:00
Vadim Gelfer
853998bf60
fix issue 322.
...
do not allow to add files that shadow files or directories already in dirstate.
2006-08-18 21:03:29 -07:00
Vadim Gelfer
0d5df3aaf3
merge.
2006-08-18 17:02:38 -07:00
Vadim Gelfer
83aa73f750
merge.
2006-08-18 15:53:30 -07:00
Vadim Gelfer
feeb6e59eb
add other dir/file case to test for issue322.
2006-08-18 15:53:14 -07:00
Brendan Cully
627744e332
Teach annotate to follow copies.
2006-08-18 14:59:18 -07:00
Brendan Cully
67fd15b596
Add self to contributors
2006-08-18 15:03:16 -07:00
Vadim Gelfer
dfb60a287c
add test for issue 322.
...
no .out file because issue is still live.
2006-08-18 14:49:12 -07:00
Vadim Gelfer
305475cdb6
merge with self.
2006-08-18 14:13:44 -07:00
Vadim Gelfer
f50eed7943
load extensions from every hgrc.
...
before this change only extensions in global hgrc files were loaded.
now extensions in per-repo hgrc are loaded.
2006-08-18 14:13:24 -07:00
Vadim Gelfer
a7a2bb9df7
merge with brendan.
2006-08-18 13:01:40 -07:00
Danek Duvall
c6b9a108d2
Solaris portability fixes
2006-08-18 10:24:04 -07:00
Brendan Cully
1bef82810e
Fix bug #345 .
...
The last hit for a file might have been before the last window, so we
can't clear copies. To reduce the load, we only store real copy
entries instead of storing hashes for every revision.
2006-08-18 10:05:44 -07:00
Giorgos Keramidas
a1e9b12e3d
add missing import of errno
2006-08-17 21:13:35 +03:00
Brendan Cully
2af338f22f
mq: fix appliedname
2006-08-16 19:55:42 -07:00
Brendan Cully
b85f7240b1
mq help text updates and speling fixes
2006-08-16 19:53:42 -07:00
Brendan Cully
3c579c8031
Add qnew -e option.
2006-08-16 19:53:01 -07:00
Brendan Cully
6fb5a7ec26
allow qrefresh to take a list of files; closes #96 .
2006-08-16 19:52:21 -07:00
Brendan Cully
af32b3788b
Fix test-mq-qdiff; add -I and -X options to qdiff
2006-08-16 19:51:39 -07:00
Brendan Cully
e5d7aafaf2
Fix qfold after recent changes
2006-08-16 19:50:50 -07:00
Brendan Cully
f814ae9ab3
sed portability fixes
2006-08-16 19:50:21 -07:00
Brendan Cully
16fb95a415
Teach mq about git patches
2006-08-16 19:49:45 -07:00
Brendan Cully
bbf7e4e798
Move import's working dir update code into patch.updatedir
2006-08-16 19:46:18 -07:00
Brendan Cully
d2c9866d08
patchbomb: import new mail module
2006-08-16 11:03:45 -07:00
Brendan Cully
a42c271a0d
mail: fix connect
2006-08-16 11:03:32 -07:00
Thomas Arendsen Hein
ae54985749
merge with tah
2006-08-18 13:07:35 +02:00
Thomas Arendsen Hein
645ecf61cd
Fix hgweb's patch display in changeset view.
2006-08-18 13:06:38 +02:00
Matt Mackall
975492a5a4
merge: consolidate dirstate updates
2006-08-15 23:17:06 -05:00
Matt Mackall
11dee4259d
merge: use file size stored in revlog index
...
Add size method to filelog to handle nodes with renames
2006-08-15 22:46:35 -05:00
Matt Mackall
6f3c141b47
merge: move forgets to the apply stage
2006-08-15 18:30:21 -05:00
Matt Mackall
69d93c90a9
trivial bool() cleanup
2006-08-15 18:12:36 -05:00
Matt Mackall
a04e906b9c
filelog.cmp: return 0 for equality
...
spotted by Alexis Carvalho
2006-08-15 16:28:00 -05:00
Matt Mackall
61c48232d9
merge: hoist some working manifest logic out of merge loop
2006-08-15 16:27:19 -05:00
Matt Mackall
dd967a0972
merge: working manifest new/changed
...
To remove dependence on m1 during manifest comparison, we distinguish between
new and changed states in mw.
2006-08-15 16:12:51 -05:00
Matt Mackall
86a0d1f25a
merge: factor out exec bit merge function
2006-08-15 15:58:10 -05:00
Matt Mackall
4483b407fd
Use revlog hash comparison technique in merge
2006-08-15 15:45:45 -05:00
Giorgos Keramidas
e8a0d4b9fc
hgext: more patchbomb documentation
...
+ Add a description of how to enable this extension
+ Note which command it provides (it's not very easy to guess
that "hgext.patchbomb" enables the "email" command, unless one
can read Python sources)
+ Expand the descriptions of the -n and -m options of "hg email".
+ Mention that formail is (commonly) part of the procmail package.
2006-08-15 23:37:37 +03:00
Vadim Gelfer
3cd0a9298f
make new tests executable.
2006-08-16 10:53:01 -07:00
Matt Mackall
e3e04b8f17
Move cmp bits from filelog to revlog
2006-08-15 14:18:13 -05:00
