Re: version control systems in meld
- From: Aaron Bentley <aaron bentley utoronto ca>
- To: stevek gnome org
- Cc: fds comnets rwth-aachen de, "Alex Collins \(Personal\)" <alex bigcatsystems co uk>, Marc Schinnenburg <msg comnets rwth-aachen de>, dk comnets rwth-aachen de, Adam Muegge <amuegge verano com>, meld-list gnome org, Markus Becker <mab comnets rwth-aachen de>
- Subject: Re: version control systems in meld
- Date: Fri, 17 Dec 2004 09:45:46 -0500
Stephen Kennedy wrote:
Hi all,
It's high time meld supported svn and arch properly.
Glad to hear it.
version.listdir(path_to_dir)
Return a list of names which are the entries at the given path. This
list may contain entries which are not in os.listdir() e.g. removed
entries.
version.stat(path)
For a single item, return an object with the following attributes
state: One of the following states.
"Normal" Checked out and unchanged
"Ignored" Explicitly ignored (i.e. .cvsignore)
"Unknown" Exists locally but not added to repository
"Newly added" Added locally but not yet committed
"Modified" Locally modified
"Conflict" Contains merge conflict
"Removed" Removed from control and local filesystem
"Missing" Checked out but missing from local filesystem
tag: symbolic tag ("testing_branch")
version: version string ("1.3.4.1" or "1236")
An extra state, 'illegal' would be very helpful.
As I've mentioned before, Arch files may be both "Unknown" and
"Modified"; there are two sets of state,
Inventory status (illegal, unknown, missing, source), (added/unadded)
and
Modification status (normal, newly added, removed, modified, conflict)
However, the model you propose will probably work 95% of the time.
For Arch, system files are also under version control, but rarely
interesting to the user. It would be useful to have a boolean for
'system file'. (for the current implementation, it would be nicer to
have an 'include system files' option to listdir)
In Arch, there's only one identifier, the revision name, and it's
associated with the entire tree (and changes each time you commit). So
we can supply a tag, but not a version, and it's not the sort of thing
you'd want to display, anyhow.
In Arch, every file has a unique ID, and it would be nice to have those
available, but not crucial.
Aaron
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]