Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2006 12:04:36 +1300] rev 1665
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 30 Jan 2006 12:02:12 +1300] rev 1664
Safer version of FileMerge merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 30 Jan 2006 12:02:06 +1300] rev 1663
return a non-zero exit code when a merge failed
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 29 Jan 2006 14:36:11 +0100] rev 1662
Added missing quote in warning text to tests, too.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 29 Jan 2006 14:33:12 +0100] rev 1661
Added missing quote in warning text.
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:30:41 +1300] rev 1660
Fix revlog signature check for empty revlogs
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:27:58 +1300] rev 1659
Add revlog version signature check
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:13:43 +1300] rev 1658
doc: clone and outgoing point to pull for valid path docs
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 19:06:42 +1300] rev 1657
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 18:38:56 +1300] rev 1656
convert-repo: use commit rather than rawcommit
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 17:22:03 +1300] rev 1655
convert-repo: automatically create empty map file
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 29 Jan 2006 17:12:31 +1300] rev 1654
deprecate the use of 'hg tag NAME [REV]'
add some tests and some doc
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 17:10:38 +1300] rev 1653
hgweb: show copy/rename links in file history
Peter van Dijk <peter@dataloss.nl> [Sun, 29 Jan 2006 00:31:11 +0100] rev 1652
unbreak templates/summary-gitweb.tmpl
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 12:23:52 +1300] rev 1651
Fix comment syntax
Peter van Dijk <peter@dataloss.nl> [Sun, 29 Jan 2006 00:18:52 +0100] rev 1650
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 11:17:54 +1300] rev 1649
hgweb: fix breakage on manifest subdirs from path cleaning
Petr Mazanec <petr.mazanec@tiscali.cz> [Sun, 29 Jan 2006 10:10:16 +1300] rev 1648
Process working files through encode filters in dodiff()
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Jan 2006 10:10:00 +1300] rev 1647
Use of opendiff as merge program on MacOS X
Hello,
If one has the developer tools installed on MacOS X there's
another alternative for the merge program.
Invocation could be done somehow like in the attached patch for
hgmerge.
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 09:10:13 +1300] rev 1646
Clean up paths passed to hgweb
(spotted by Peter van Dijk)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 29 Jan 2006 08:38:31 +1300] rev 1645
add removed files to the changelog file list
- this should allow better detection of removed file
when walking in the history (like hg log)
it doesn't help for the fast path of hg log where
we only look at the filelog
- users of the changelog file list shouldn't assume
anymore that the file still exist (anyway it won't
be found in the manifest like in 5ecf05541e11)
- fix the tests (some hashes changed)
mason@suse.com [Sat, 28 Jan 2006 17:16:15 +1300] rev 1644
Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:15:39 +0100] rev 1643
bash_completion: ignore hg help error messages
They are usually not useful when you're completing stuff and end up
cluttering the screen.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:11:14 +0100] rev 1642
bash_completion: always use single quotes with compgen -W
This avoids a bug in bash 2.05a
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:10:35 +0100] rev 1641
bash_completion: be more careful about whitespaces
- use awk to parse the output of hg help.
- print one completion candidate per line
- print the debug commands after regular commands
(this eases the shell side of the parsing)
- don't print aliases that are simple abbreviations
(e.g. up/update, id/identify)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Jan 2006 16:37:31 +0100] rev 1640
Added hint to hg-ssh that you can use shell pattern matching.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Jan 2006 15:07:46 +0100] rev 1639
_hg_status improvements in bash_completion:
- Use "hg status -n" option instead of cut command.
- Sort status flags accoring to "hg status --help"
- Show deleted files instead of "hg remove"d for "hg remove"
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Jan 2006 14:52:26 +0100] rev 1638
bash_completion: small updates and fixes
- $result in _hg_commands is not an array
- use "hg status ."
- update "hg cat" completion
- let bash itself generate the default completion
mason@suse.com [Tue, 24 Jan 2006 15:02:10 +1300] rev 1637
Add new bdiff based unidiff generation.
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 14:49:19 +1300] rev 1636
contrib: add Chris Mason's stand-alone diff tool
This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
efiring@manini.soest.hawaii.edu [Tue, 24 Jan 2006 13:59:11 +1300] rev 1635
Fix rcpath for hgwebdir case (sys.argv is empty)
Robin Farine <robin.farine@terminus.org> [Tue, 24 Jan 2006 13:59:01 +1300] rev 1634
copy & rename can ignore removed source files
As mercurial now distinguishes deleted files from removed files,
we can skip removed source files while copying or renaming.
Robin Farine <robin.farine@terminus.org> [Tue, 24 Jan 2006 13:57:09 +1300] rev 1633
copy/rename '.' or '..' correctly
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 13:50:40 +1300] rev 1632
Merge with Eric
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 13:49:20 +1300] rev 1631
Merge with crew
Eric Hopper <hopper@omnifarious.org> [Fri, 20 Jan 2006 09:35:43 -0800] rev 1630
This fixes a bug that Chris Mason found. As for a test case, I can't
think of one. It's a very weird case. Basically, if there is a file
listed as changed in the changelog entry, but not showing up in any
of the associated manifest entries, hg would abort when trying to
create a changeset. Now it just decides the file must not have any
versions relevant to the changeset.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Jan 2006 18:54:25 +0100] rev 1629
Copy manifest map before modifying it (see issue86)
Matt Mackall <mpm@selenic.com> [Mon, 23 Jan 2006 16:36:44 +1300] rev 1628
[hgweb] Prevent search engine bots from indexing the entire repository
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Jan 2006 17:07:48 +0100] rev 1627
fix for hgweb.filterfiles
some variable weren't converted, fix a possible out of range error
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Jan 2006 16:55:05 +0100] rev 1626
make the order of the arguments for filterfiles consistent
fix a bug where the order was reversed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 17 Jan 2006 16:10:22 +0100] rev 1625
correct the relative path when walking from a subdir
- yield the correct relative path when walking from a subdir
(regardless the walk is repo-wide or not)
- have a consistent output from all commands: filename are
absolute when no patterns are specified and relative otherwise.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jan 2006 16:00:55 +0100] rev 1624
Added test for relative paths and all status flags for 'hg status'
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jan 2006 15:03:47 +0100] rev 1623
Added test for the currently broken addremove with the expected output.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Jan 2006 15:51:09 +0100] rev 1622
fix locate broken since 63799b01985c
- fix the keyword arguments for walk in commands.locate
- implement 'hg locate -r <rev>'
- add a test for 'hg locate'
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 21:55:19 +0100] rev 1621
Restored old behaviour for 'hg co' and 'hg co -C' for removed files.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 21:02:38 +0100] rev 1620
Adjusted all but one test output for the new behaviour of localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 13:58:36 +0100] rev 1619
Distinguish removed and deleted files. Tests are not fixed yet.
hg status will now show "R filename" for "hg rm"ed files and
"! filename" for files which were deleted manually.
Manually deleted files are considered unmodified.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 13:35:09 +0100] rev 1618
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 12:22:28 +0100] rev 1617
Make localrepo.changes() internally distinguish between removed and deleted.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 11:32:07 +0100] rev 1616
Cleaned up localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 07:57:58 +0100] rev 1615
Cleanup of indentation, spacing, newlines, strings and line length
Vincent Danjean <Vincent.Danjean@ens-lyon.org> [Thu, 12 Jan 2006 06:29:06 +0100] rev 1614
hgk.py is not a script (no '#!' line needed)
Guy Brand <gb@isis.u-strasbg.fr> [Tue, 10 Jan 2006 13:12:13 +0100] rev 1613
Added archives links to gitweb template
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Jan 2006 16:34:20 +0100] rev 1612
Adjusted test output to match new hgignore error messages.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:52:56 -0800] rev 1611
make invalid pattern message not confusing.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:48:16 -0800] rev 1610
if hgignore contains errors, print message that is not confusing.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 15:25:33 -0800] rev 1609
eliminate backtrace when piping output on windows.
this fixes issue 54.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 02 Jan 2006 14:31:25 -0800] rev 1608
document revert command more accurately.
this fixes issue 87.
Muli Ben-Yehuda <mulix@mulix.org> [Thu, 29 Dec 2005 14:59:19 -0600] rev 1607
add '_' to several strings
Muli Ben-Yehuda <mulix@mulix.org> [Thu, 29 Dec 2005 14:51:29 -0600] rev 1606
- duplicate the parent link logic to show child links
- don't show trivial parent or children links
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:22:26 -0800] rev 1605
merge with mainline
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:13:52 -0800] rev 1604
add --plain option to patchbomb.
this omits the hg patch headers. it makes a patchbomb email look like
a regular email with a patch.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 28 Dec 2005 07:11:46 -0800] rev 1603
make patchbomb work with recent changes to export
Muli Ben-Yehuda <mulix@mulix.org> [Wed, 28 Dec 2005 00:27:05 -0600] rev 1602
strictly adher to 80 chars per line