Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:20:48 -0500] rev 3308
filectx: add size method
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:08:41 -0500] rev 3307
run-tests: add --first switch to exit on first error
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 23:05:11 -0500] rev 3306
run-tests: add --retest switch
-r reruns tests for which a .err file exists
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 21:27:04 -0500] rev 3305
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 21:04:25 -0500] rev 3304
fix workingfilectx parents and ancestor functions
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 20:32:03 -0500] rev 3303
merge: pass contexts to applyupdates
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 18:13:38 -0500] rev 3302
merge: don't call hooks for revert
- don't call hooks for revert
- use extra variables to avoid swapping contexts
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 16:07:19 -0500] rev 3301
merge: use contexts for manifestmerge
- take ma, backwards, and copy out of update
- move findcopies call inside manifestmerge
- pass repo rather than ui
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 14:02:01 -0500] rev 3300
commit: unify file-level commit code
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 10 Oct 2006 00:02:30 +0200] rev 3299
fix localrepo.status when dealing with x-bit changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:48:44 +0200] rev 3298
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 21:22:55 +0200] rev 3297
merge with upstream
Matt Mackall <mpm@selenic.com> [Sun, 08 Oct 2006 20:18:59 -0500] rev 3296
Use filelog.cmp in checkfilemerge
Matt Mackall <mpm@selenic.com> [Sun, 08 Oct 2006 19:57:45 -0500] rev 3295
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 15:52:37 +0200] rev 3294
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 09 Oct 2006 15:44:20 +0200] rev 3293
bundle --base: use the right set for the base
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 08 Oct 2006 20:27:23 -0300] rev 3292
fix bash completion of debug commands; add test for debugcomplete
The debugconfig -> showconfig renaming broke things.
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Sat, 07 Oct 2006 15:16:47 -0400] rev 3291
[patchbomb] prepend leading zeros in the "[PATCH N of M]" string
Without this patch, if one tries to send a patch bomb with more than 9
patches, the resulting subjects are not easily alphabetically sortable.
For example:
...
[PATCH 9 of 10]
[PATCH 10 of 10]
This patch prepends as many leading zeros as necessary. E.g.,
[PATCH 09 of 10]
or
[PATCH 009 of 100]
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Oct 2006 10:56:21 +0200] rev 3290
merged now fully working base85 codec, though currently unused.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Oct 2006 10:55:11 +0200] rev 3289
merge with upstream
Matt Mackall <mpm@selenic.com> [Sat, 07 Oct 2006 17:30:26 -0500] rev 3288
Fix undetected change bug in rename tests
Brendan Cully <brendan@kublai.com> [Sat, 07 Oct 2006 16:21:33 -0700] rev 3287
Handle odd-sized base85 input and output
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Oct 2006 22:11:02 +0200] rev 3286
Put in backslash again, it was needed to disable an asciidoc macro.
Backed out changeset c05b0cc6b1485bb240e118a2be9e1d52bb25fd65
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Oct 2006 22:02:56 +0200] rev 3285
Corrected typo in date format, found by Rob Landley.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Oct 2006 18:14:03 +0200] rev 3284
Make test-bundle-r executable.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 20 Jul 2006 19:25:11 +0200] rev 3283
add -r/--rev and --base option to bundle
--rev is used to specify a target rev (like pull or clone)
--base REV is used to specify a base instead of a target repo
the target repo is assumed to have all the rev specified in --base
Matt Mackall <mpm@selenic.com> [Fri, 06 Oct 2006 17:14:50 -0500] rev 3282
Update test output
Matt Mackall <mpm@selenic.com> [Fri, 06 Oct 2006 17:14:18 -0500] rev 3281
Merge with crew
Matt Mackall <mpm@selenic.com> [Fri, 06 Oct 2006 16:55:11 -0500] rev 3280
merge: copy fixes and tests
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
Brendan Cully <brendan@kublai.com> [Fri, 06 Oct 2006 13:01:54 -0700] rev 3279
Add a base85 codec
Brendan Cully <brendan@kublai.com> [Fri, 06 Oct 2006 12:58:50 -0700] rev 3278
hgweb: fix filerevision raw URL
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 06 Oct 2006 19:21:43 +0200] rev 3277
disallow commands on non local repository
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 06 Oct 2006 18:38:32 +0200] rev 3276
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 06 Oct 2006 18:28:50 +0200] rev 3275
hgweb: Search templates in templatepath/style/map, too, using a common function.
This allows for web templates to be self-contained in a directory, which makes
copying and modifying them easier.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 06 Oct 2006 16:24:14 +0200] rev 3274
ssh: make the error message more clear, add a testcase
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 15:36:53 -0700] rev 3273
hgweb: be more conservative about expanding SCRIPT_NAME
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 15:04:15 -0700] rev 3272
Add {getentries} to default style
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 14:45:15 -0700] rev 3271
hgweb: fix NWI parsing when hgwebdir isn't at /
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 14:27:14 -0700] rev 3270
hgweb: convert gitweb to NWI
Brendan Cully <brendan@kublai.com> [Thu, 05 Oct 2006 14:27:14 -0700] rev 3269
hgweb: provide means for handling query parameters
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 20:03:38 +0200] rev 3268
Some versions of sed don't support .\+, so use ..* instead.
Reported by Christian Ebert for MacOS X.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 15:51:54 +0200] rev 3267
Un-debugify debugconfig to showconfig. (issue 317)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 11:57:38 +0200] rev 3266
hgweb: Added safety net for PATH_INFO starting with double slash.
This happens e.g. when using the following apache config:
RewriteRule (.*) /hgwebdir/$1 [PT]
instead of the less readable (but more correct):
RewriteRule (.*) /hgwebdir$1 [PT]
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 10:15:22 +0200] rev 3265
merged NewWebInterface
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3264
Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3263
Rename default style to old
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3262
hgweb: support for generating and parsing NWI URLs
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3261
Teach hgwebdir about new interface
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3260
hgweb: extract raw prefix from NWI commands
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 17:04:40 -0700] rev 3259
hgweb: accept NewWebInterface URLs
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 10:07:40 +0200] rev 3258
merge with upstream
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 19:08:04 -0500] rev 3257
merge: fixes for merge+rename
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 17:59:27 -0500] rev 3256
Make status -C work with merge+rename
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 15:43:27 -0500] rev 3255
merge: add rename following
Currently disabled by default, enable with
[merge]
followcopies = 1
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 14:33:22 -0500] rev 3254
merge: reduce manifest copying
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 05 Oct 2006 00:14:21 +0200] rev 3253
merge with crew
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:22 +0200] rev 3252
Add documentation about the date formats allowed in the command line
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:18 +0200] rev 3251
util.strdate: assume local time when no timezone specified
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:14 +0200] rev 3250
util.strdate: compute timestamp using UTC, not local timezone
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 04 Oct 2006 22:07:03 +0200] rev 3249
merge with upstream
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 14:09:26 -0500] rev 3248
merge: reorder dirstate update slightly for correctness
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 12:39:51 -0700] rev 3247
patchbomb: update --attach to use cmdutil.make_filename
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 11:14:33 -0700] rev 3246
hgweb: fix manifest link in gitweb summary
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 04 Oct 2006 18:43:40 +0200] rev 3245
Corrected install location of manpages.
(man/manSECTION/ instead of man/man.SECTION/)
Wojciech Milkowski <wmilkowski@interia.pl> [Wed, 04 Oct 2006 18:06:03 +0200] rev 3244
Fix static file serving over HTTP on Windows.
Files to be served should be opened in binary mode.
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 16:36:40 -0700] rev 3243
mq: update qfold to call delete correctly
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 12:28:27 -0700] rev 3242
Make changectx.filenode raise repo.LookupError on failure
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 12:14:33 -0700] rev 3241
Merge with upstream
Matt Mackall <mpm@selenic.com> [Tue, 03 Oct 2006 01:21:46 -0500] rev 3240
merge: use new working context object in update
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 22:03:14 -0500] rev 3239
contexts: add working dir and working file contexts
add workingctx
add workingfilectx
extend filectx.annotate for rev=None
extend filectx.ancestor
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:28:44 -0500] rev 3238
context: simplify repr methods
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:17:59 -0500] rev 3237
contexts: use __getattr__ rather than try/except in changectx
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:02:28 -0500] rev 3236
context: make filectx remember changectx in changectx.filectx
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 14:23:38 -0500] rev 3235
Make filectx lazier
Lazy opening of filelog, lazy lookup of filenode and changeid
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 12:06:33 -0500] rev 3234
merge: remove old merge function
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 12:04:48 -0500] rev 3233
merge: extend file merge function for renames
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Oct 2006 11:54:11 +0200] rev 3232
Fix minor indentation problem in template-vars.txt
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Oct 2006 11:53:35 +0200] rev 3231
Install all files/subdirectories below templates.
This is needed because styles are now in their own subdirectory.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Oct 2006 11:30:59 +0200] rev 3230
Applied coding style to setup.py
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 17:59:39 -0700] rev 3229
Use parentrevs shortcut in filectx.annotate
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 17:37:57 -0700] rev 3228
Move raw theme into subdirectory
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 17:35:41 -0700] rev 3227
Move RSS theme into subdirectory
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 17:30:45 -0700] rev 3226
Move gitweb theme into subdirectory
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 22:35:52 +0200] rev 3225
[extendedchangelog] add extra metadata in the changelog entry
- add a third item in the date field that holds arbitrary
key:value items
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 22:35:37 +0200] rev 3224
[extendedchangelog] encode/decode function
encode '\n', '\r' and '\0'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 21:10:31 +0200] rev 3223
fix warnings from pychecker
Brendan Cully <brendan@kublai.com> [Mon, 02 Oct 2006 09:58:03 -0700] rev 3222
Fix gitweb index archive link
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 08:40:26 +0200] rev 3221
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 02 Oct 2006 08:36:29 +0200] rev 3220
test-merge-revert2 solaris fix
Brendan Cully <brendan@kublai.com> [Sun, 01 Oct 2006 13:44:08 -0700] rev 3219
Make filectx.__init__ use LookupError
Brendan Cully <brendan@kublai.com> [Sun, 01 Oct 2006 12:56:58 -0700] rev 3218
hgweb: add methods to get contexts from request
Brendan Cully <brendan@kublai.com> [Sun, 01 Oct 2006 12:42:50 -0700] rev 3217
Raise LookupError in changectx.filectx if filenode can't be found
Brendan Cully <brendan@kublai.com> [Sun, 01 Oct 2006 11:58:55 -0700] rev 3216
Add hg.LookupError
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 01 Oct 2006 19:26:33 +0200] rev 3215
Whitespace/Tab cleanup
Edouard Gomez <ed.gomez@free.fr> [Thu, 21 Sep 2006 21:24:53 +0200] rev 3214
Add gitweb style hgwebdir
Edouard Gomez <ed.gomez@free.fr> [Thu, 21 Sep 2006 21:24:26 +0200] rev 3213
Add style support to hgwebdir
Brendan Cully <brendan@kublai.com> [Sat, 30 Sep 2006 21:32:29 -0700] rev 3212
hgweb: use contexts in more handlers
Brendan Cully <brendan@kublai.com> [Sat, 30 Sep 2006 20:56:26 -0700] rev 3211
filelog.annotate is now obsolete
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 30 Sep 2006 15:15:59 +0200] rev 3210
correctly find the type of 'id' in revlog.lookup
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 12:34:31 +0200] rev 3209
merged brendan's hgweb cleanups
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3208
hgweb: teach siblings and callers to use contexts
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3207
Add lookup method to filectx
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3206
hgweb: kill off #filenode#
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 16:26:09 -0700] rev 3205
hgweb: kill #manifest#
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 10:29:57 +0200] rev 3204
Remove duplicate walkopts + dryrunopts from addremove.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 09:46:03 +0200] rev 3203
Merge with upstream
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 17:50:59 -0500] rev 3202
merge: minor nullid cleanup
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 17:47:51 -0500] rev 3201
context: add __nonzero__ methods
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:39:38 -0500] rev 3200
merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:29:44 -0500] rev 3199
Add str methods to contexts
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 16:01:46 -0500] rev 3198
Add equality operators to changectx and filectx
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 15:56:36 -0500] rev 3197
localrepo.parents: return null context for no parents
Matt Mackall <mpm@selenic.com> [Fri, 29 Sep 2006 15:48:16 -0500] rev 3196
Add localrepo.parents to get parent changectxs.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 30 Sep 2006 09:39:44 +0200] rev 3195
Remove unneeded (and bashismic) export HGMERGE=true.
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 18:17:29 -0700] rev 3194
Templater expects an iterable copies variable (fixes notify).
Stephen Darnell <stephen@darnell.plus.com> [Thu, 28 Sep 2006 21:00:01 +0100] rev 3193
Remove single character equivalent of --nodates (was -D)
Stephen Darnell <stephen@darnell.plus.com> [Tue, 26 Sep 2006 00:05:24 +0100] rev 3192
Add -D/--nodates options to hg diff/export that removes dates from diff headers
and replace uses of sed in the tests with --nodates.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Sep 2006 23:14:22 +0200] rev 3191
Documentation clarification for --update option to pull and unbundle
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:01:19 -0700] rev 3190
Show copies in hg log.
The format is:
copies: destination (source)...
Brendan Cully <brendan@kublai.com> [Fri, 29 Sep 2006 13:00:54 -0700] rev 3189
Abstract manifest block parsing.