Fri Jun 30 00:38:26 CEST 2006 ydirson@xxxxxxxxxx
* [git] Improve error cases when importing branches
This patch creates a new exception to identify the case where the user made
an error
when specifying a "branchpoint" parameter, and does an explicit check to
abort when
attempting to initialize an already-intialized git target repo (most notably
hit in
New patches:
[[git] Improve error cases when importing branches
ydirson@xxxxxxxxxx**20060629223826
This patch creates a new exception to identify the case where the user made an
error
when specifying a "branchpoint" parameter, and does an explicit check to abort
when
attempting to initialize an already-intialized git target repo (most notably
hit in
] {
hunk ./vcpx/repository/git.py 23
+from vcpx import TailorException
+
+class BranchpointFailure(TailorException):
+ "Specified branchpoint not found in parent branch"
hunk ./vcpx/repository/git.py 435
- bp = self._tryCommand(['rev-parse',
self.repository.BRANCHPOINT])[0]
+ bp = self._tryCommand(['rev-parse',
self.repository.BRANCHPOINT],
+ BranchpointFailure)[0]
hunk ./vcpx/repository/git.py 442
+ if exists(join(self.basedir, self.repository.storagedir)):
+ raise TargetInitializationFailure(
+ "Repository %s already exists - "
+ "did you forget to set \"branch\" parameter ?" %
self.repository.storagedir)
+
}
Context:
[[darcs source] don't repeat patch name in changelog
Adeodato Simo <dato@xxxxxxxxxxxxxx>**20060627173907
Make endElement's behavior consistent with that of _getUpstreamChangesets,
and don't include the patch name in the changelog, even if this one is
empty.
]
[[bzr] when removing files, get files removed before the directory they're in
Adeodato Simo <dato@xxxxxxxxxxxxxx>**20060627124651]
[Replace dashes with underscores in the hg command names
Andrea Arcangeli <andrea@xxxxxxx>**20060629085140]
[Added the vcpx.repository subpackage
Andrea Arcangeli <andrea@xxxxxxx>**20060629085111]
[[git] add support for "repository" parameter
ydirson@xxxxxxxxxx**20060628232502]
[Use "_editXXX" instead of "_recordUpdatedXXX" for consistency
lele@xxxxxxxxxxxxxxxxxxx**20060625191345]
[[git] make it more obvious what the parts common to source and target are
ydirson@xxxxxxxxxx**20060625212508]
[Initialize logger in repository before loading the project
ydirson@xxxxxxxxxx**20060625170002
This makes the loader available to backend-specific _load() methods.
]
[Misc parent-repo fixes and cleanups
ydirson@xxxxxxxxxx**20060625163858
Do not use a default value of '' for parent-repo. Also fix a bug introduced
while moving parent-repo support out of tailor.py.
]
[Revert change to Tailorizer.bootstrap()
lele@xxxxxxxxxxxxxxxxxxx**20060625145731
Only git knows about PARENT_REPO at this point, so the test must
performed by the specific workingdir.
]
[Fix repository instantiation
lele@xxxxxxxxxxxxxxxxxxx**20060625143256
Don't use the logger, since we don't have one yet. The caller
will log something for us. Moved (and tested) the bzr specific
code into the pertaining unit.
]
[Revert last change on cvs logger name
lele@xxxxxxxxxxxxxxxxxxx**20060625143050
The name of the logger is still "tailor.vcpx.REP-KIND.xxx"
]
[Add missing InvocationError import
ydirson@xxxxxxxxxx**20060625122513]
[Initial support for branches in git target
ydirson@xxxxxxxxxx**20060625093336]
[Fix remaining references to path predating the repository.py split
ydirson@xxxxxxxxxx**20060625092552]
[Untabified
lele@xxxxxxxxxxxxxxxxxxx**20060625074557]
[Whitespace, two blank lines to separate classes
lele@xxxxxxxxxxxxxxxxxxx**20060624232548]
[Split the monolithic repository.py into smaller units
lele@xxxxxxxxxxxxxxxxxxx**20060624231208
The repository subclass of each backend is now in the same unit that
implements its working dir, under the vcpx.repository subpackage.
This has several advantages: the obvious of keeping related code closer
and the ability of lazy load only the needed unit, as it was already done
for the working dir subclasses.
]
[Use a common ancestor to recognize tailor exceptions
lele@xxxxxxxxxxxxxxxxxxx**20060624231157]
[Fix comment
lele@xxxxxxxxxxxxxxxxxxx**20060624225007]
[[git] commit at plumbing level
ydirson@xxxxxxxxxx**20060624205128
This avoids to call the git-commit shell script, and uses low-level git tools
to do the same job.
]
[[git] do not rely on "git-commit -a", use git-update-index
ydirson@xxxxxxxxxx**20060624175743
This is the first part of getting rid of git-commit. We explicitely
update the index for each type of file modification.
]
[Fix _tryCommand call in _getRev
ydirson@xxxxxxxxxx**20060624164742
I have not experienced the problem, but it seems clear _tryCommand is not
correctly called here.
]
[Add a hook to record updated entries in target repo
ydirson@xxxxxxxxxx**20060624155209]
[Correctly display "default encoding" warning
ydirson@xxxxxxxxxx**20060624154115]
[[hg] call add with no arguments on init
Brendan Cully <brendan@xxxxxxxxxx>**20060621204559]
[[hg] canonify repository root directory
Brendan Cully <brendan@xxxxxxxxxx>**20060621191453
The dirstate walker uses simple string comparison between repo.root
and os.getcwd(), which may fail unexpectedly if repo.root is not
the same as realpath(repo.root)
]
[[hg] chdir to self.basedir before executing commands
Brendan Cully <brendan@xxxxxxxxxx>**20060621184724
Some hg tree walk operations expect to be started from the repository
root (the command-line tool always does this). Without this patch
the dirstate walk may occasionally inappropriately mangle paths,
depending on where tailor is run from.
]
[[hg] Remove files under subdirectories
Brendan Cully <brendan@xxxxxxxxxx>**20060620210828
removePathnames was just ignoring directories instead of
removing the files under them. Tailor should walk mercurial's
dirstate and remove all files under a removed directory.
]
[[hg] Use high level commit command
Brendan Cully <brendan@xxxxxxxxxx>**20060620203136
commands.commit takes care of expanding directories to their component
files so we don't have to (we weren't doing it correctly either). If
mercurial ever decides to track directories, this will already be
correct.
]
[[hg] wrapper for commands.*
Brendan Cully <brendan@xxxxxxxxxx>**20060620190739
_hgCommand makes it easier to call commands.* functions, and
ensures they will always have their options dictionary set
correctly.
]
[[hg] always use repository-specific UI when repository is available
Brendan Cully <brendan@xxxxxxxxxx>**20060620190521]
[Possible fix for #56: detect branch name at bootstrap
lele@xxxxxxxxxxxxxxxxxxx**20060616160613]
[Use normalized path for comparing with paths from bzrlib
lele@xxxxxxxxxxxxxxxxxxx**20060613003131
This is the patch attached to ticket #59, thank you luks.
]
[M-x whitespace-cleanup
lele@xxxxxxxxxxxxxxxxxxx**20060613001814]
[Remove useless imports noticed by pyflakes
lele@xxxxxxxxxxxxxxxxxxx**20060613001734]
[Catch ConfigParser exceptions
lele@xxxxxxxxxxxxxxxxxxx**20060609131040]
[Use the new SF.NET nomenclature to reach the CVS repositories
lele@xxxxxxxxxxxxxxxxxxx**20060609130949]
[Make changeset-threshold a cvs parameter
Yann Dirson <ydirson@xxxxxxxxxx>**20060606072820]
[Compare the revision with branch only when following a branch
lele@xxxxxxxxxxxxxxxxxxx**20060606072329]
[Revisited generation of commit entries
lele@xxxxxxxxxxxxxxxxxxx**20060530134057
Consider added names first, and add the old name in the abstract method.
This should fix #39 where parent dirs are committed after child, either
in very large svn commit or coming from CVS.
]
[Add fake events at the end of the loop
lele@xxxxxxxxxxxxxxxxxxx**20060530133517]
[TAG Version 0.9.23
lele@xxxxxxxxxxxxxxxxxxx**20060528091814]
Patch bundle hash:
faa9be1b78093c40108fb3cc71bd6497b50400cc
_______________________________________________
Tailor mailing list
Tailor@xxxxxxxxxxxxxxx
http://lists.zooko.com/mailman/listinfo/tailor
|
