← Back to branch summary

~ubuntu-branches/ubuntu/lucid/meld/lucid

« back to all changes in this revision

Viewing changes to vc/svn.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Budde
  • Date: 2008-11-15 13:35:17 UTC
  • mfrom: (1.2.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20081115133517-sc4a92bn3e9yxuxu
Tags: 1.2-0ubuntu1
https://launchpad.net/bugs/283725
https://launchpad.net/bugs/234259
https://launchpad.net/bugs/152913
* New upstream release. (LP: #283725)
* debian/copyright:
  - Updated email of upstream author to what is stated in MAINTAINERS.
* debian/control.in:
  - Bumped standards-version to 3.8.0.
* debian/patches/html_patch_by_kai_willadsen.patch:
  - Removed, fixed upstream.
* debian/patches/fix-fr-help-makefile.patch:
  - Ignore error when trying to install files from the non existent
    directory 'help/fr/figures'.
* debian/patches/only-ignore-fully-blank-changes.patch:
  - Do not jump to the last blank change in blank changes are ignored and
    do not jump over blank changes if they are not ignored. Fixes bug that
    caused some differences to be ignored when using 'Up and 'Down' buttons.
    Patch by Martin Renold. (LP: #234259)
* debian/patches/escape-paths.patch:
  - Escape paths so mime type is recoqnized correctly. Patch by Ivan
    Sergeyenko. Fixed in upstream development version. (LP: #152913)

Show diffs side-by-side

added added

removed removed

Lines of Context:
vc/svn.py
43
43
    def update_command(self):
44
44
        return [self.CMD,"update"]
45
45
    def add_command(self, binary=0):
46
 
        if binary:
47
 
            return [self.CMD,"add","-kb"]
48
46
        return [self.CMD,"add"]
49
47
    def remove_command(self, force=0):
50
48
        return [self.CMD,"rm","--force"]
51
49
    def revert_command(self):
52
50
        return [self.CMD,"revert"]
53
51
 
54
 
    def lookup_files(self, dirs, files):
55
 
        "files is array of (name, path). assume all files in same dir"
56
 
        if len(files):
57
 
            directory = os.path.dirname(files[0][1])
58
 
        elif len(dirs):
59
 
            directory = os.path.dirname(dirs[0][1])
60
 
        else:
61
 
            return [],[]
 
52
    def _get_dirsandfiles(self, directory, dirs, files):
62
53
 
63
54
        while 1:
64
55
            try:
70
61
 
71
62
        retfiles = []
72
63
        retdirs = []
73
 
        matches = re.findall("^(.)....\s+(?:\d+\s+([^\s]+)\s+[^\s]+\s+)?(.*)$(?m)", entries)
74
 
        matches = [ (m[2],m[0],m[1]) for m in matches]
 
64
        matches = []
 
65
        for line in entries.split("\n"):
 
66
            if len(line) > 40:
 
67
                matches.append( (line[40:], line[0], line[17:26].strip()))
75
68
        matches.sort()
76
69
 
77
70
        for match in matches: