~ubuntu-branches/ubuntu/utopic/pida/utopic

« back to all changes in this revision

Viewing changes to pida/utils/vc/mercurial.py

  • Committer: Bazaar Package Importer
  • Author(s): Jan Luebbe
  • Date: 2007-04-17 16:08:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20070417160806-3ttlb6igf94x9i03
Tags: 0.4.4-1
* New upstream release (closes: #419129)
* Add dependency on python-glade2 (closes: #418716)
* Update copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
41
41
        raise ValueError()
42
42
 
43
43
    def commit_command(self, message):
44
 
        return [self.CMD,"commit","-t",message]
 
44
        return [self.CMD,"commit","-m",message]
45
45
    def diff_command(self):
46
46
        return [self.CMD,"diff"]
47
47
    def update_command(self):
66
66
 
67
67
        while 1:
68
68
            try:
69
 
                entries = os.popen("cd %s && hg status "%directory).read().split("\n")[:-1]
 
69
                entries = os.popen("cd %s && hg status ."%directory).read().split("\n")[:-1]
70
70
                break
71
71
            except OSError, e:
72
72
                if e.errno != errno.EAGAIN:
81
81
            "!": _vc.STATE_MISSING,
82
82
            "I": _vc.STATE_IGNORED,
83
83
            "M": _vc.STATE_MODIFIED,
84
 
            "C": _vc.STATE_CONFLICT }
 
84
            "C": _vc.STATE_CONFLICT,
 
85
            "R": _vc.STATE_REMOVED
 
86
            }
85
87
        hgfiles = {}
86
88
        for statekey, name in [ (entry[0], entry[2:]) for entry in entries if entry.find("/")==-1 ]:
87
89
            path = os.path.join(directory, name)