Thu May 11 14:57:57 PDT 2006 Brendan Cully <[EMAIL PROTECTED]>
* Skip pointless checkout after clone in hg source
Thu May 11 16:02:27 PDT 2006 Brendan Cully <[EMAIL PROTECTED]>
* git target: don't choke on empty commit messages
Thu May 11 16:05:18 PDT 2006 Brendan Cully <[EMAIL PROTECTED]>
* git source: allow updates across branches
Updating from revision x to revision x+1 can cross branches that
won't be merged until later. repo.update won't allow this without
the force option. We don't always set force, in case the user has
(mistakenly) edited the working directory directly. Instead,
if plain update fails we check for dirstate modifications and
update with force if there are none.
Thu May 11 16:08:16 PDT 2006 Brendan Cully <[EMAIL PROTECTED]>
* git source: handle copy from one source to many targets
A file can be copied to several targets in one commit. tailor
doesn't know about copies, so we file them as multiple renames for
now. This may confuse targets that very reasonably only accept a
single rename, but the alternative throws away file history.
Thu May 11 16:11:32 PDT 2006 Brendan Cully <[EMAIL PROTECTED]>
* speling fix
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
New patches:
[Skip pointless checkout after clone in hg source
Brendan Cully <[EMAIL PROTECTED]>**20060511215757] {
hunk ./vcpx/hg.py 44
+ opts['noupdate'] = True
}
[git target: don't choke on empty commit messages
Brendan Cully <[EMAIL PROTECTED]>**20060511230227] {
hunk ./vcpx/git.py 244
+ if not logmessage:
+ logmessage = 'No commit message\n'
}
[git source: allow updates across branches
Brendan Cully <[EMAIL PROTECTED]>**20060511230518
Updating from revision x to revision x+1 can cross branches that
won't be merged until later. repo.update won't allow this without
the force option. We don't always set force, in case the user has
(mistakenly) edited the working directory directly. Instead,
if plain update fails we check for dirstate modifications and
update with force if there are none.
] {
hunk ./vcpx/hg.py 84
- - return repo.update(node)
+ res = repo.update(node)
+ if res:
+ # Files in to-be-merged changesets not on the trunk will
+ # cause a merge error on update. If no files are modified,
+ # added, removed, or deleted, do update -C
+ modified = [x for x in repo.changes()[0:4] if x]
+ if modified:
+ return modified
+ return repo.update(node, force=True)
}
[git source: handle copy from one source to many targets
Brendan Cully <[EMAIL PROTECTED]>**20060511230816
A file can be copied to several targets in one commit. tailor
doesn't know about copies, so we file them as multiple renames for
now. This may confuse targets that very reasonably only accept a
single rename, but the alternative throws away file history.
] {
hunk ./vcpx/hg.py 140
- - pms.pop(oldname[0])
+ # hg copy can copy the same file to multiple destinations
+ # Currently this is handled as multiple renames. It would
+ # probably be better to have ChangesetEntry.COPIED.
+ if pms.has_key(oldname[0]):
+ pms.pop(oldname[0])
}
[speling fix
Brendan Cully <[EMAIL PROTECTED]>**20060511231132] {
hunk ./vcpx/source.py 135
- - self.log.critical("Couldn't reply changeset")
+ self.log.critical("Couldn't replay changeset")
hunk ./vcpx/source.py 140
- - self.log.exception("Couldn't reply changeset\n%s",
+ self.log.exception("Couldn't replay changeset\n%s",
}
Context:
[Emit a warning message whenever the SVN backend skips a file out of scope
[EMAIL PROTECTED]
[Simple tests for basic CVS revision numbers handling
[EMAIL PROTECTED]
[Adjust the source repository of one test
[EMAIL PROTECTED]
[Test for CVS tag-entries configuration
[EMAIL PROTECTED]
[Emit some noise when forcing CVS sticky tag
[EMAIL PROTECTED]
[Use a different extension for the old version of CVS/Entries
[EMAIL PROTECTED]
When forcing a sticky tag on each CVS entry, use '.tailor-old' instead
of simply '.old' to avoid name clashes, as CVS sometime leaves that
itself. Also, remove the old copy when done.
]
[Rename entries to names in bzr backend
[EMAIL PROTECTED]
Entries refer to ChangesetEntry, but here it's just an array of filenames.
]
[Spell fix: it's synchronize, not syncronize
[EMAIL PROTECTED]
[Better docstrings in bzr.py
[EMAIL PROTECTED]
[Fixes for bzr 0.8 release
[EMAIL PROTECTED]
Use create_branch_convenience from bzrlib to create a branch. Allow for the
root-directory to be part of a shared repository, so it can share history with
other branches.
No need to store the bzrlib objects bzrdir and branch inside BzrWorkingDir.
All operations should happen through the workingtree object.
Renamed some variables to make their intent more clear.
]
[Remove final slash from svn repository
[EMAIL PROTECTED]
[Query hg for default options
Brendan Cully <[EMAIL PROTECTED]>**20060503210511
hg looks up command options from the argument without trapping
KeyError. So whenever an option is added to an hg command, tailor
backtraces until it's been taught to pass in the new option. This
patch queries hg for the set of options for all commands, which
should provide some protection against this particular problem.
]
[hglib.py -> hg.py implies HglibWorkingDir -> HgWorkingDir
Brendan Cully <[EMAIL PROTECTED]>**20060503210444]
[TAG Version 0.9.22
[EMAIL PROTECTED]
Patch bundle hash:
fe9e7abd41c1f1dc142cb7aa610f2e27784e5728
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFEY8ZKIigsijWFMDIRAvqnAJsHz5HwKD1bAr9S5qkXGAAKzNpIdgCeK1ZT
fbm8kCrs5WzhBMMsZXw0yPQ=
=Amdd
-----END PGP SIGNATURE-----
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
