/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/program.py

  • Committer: Tim Marston
  • Date: 2021-07-05 20:27:11 UTC
  • Revision ID: tim@ed.am-20210705202711-vklvsctrh5yhgjj7
added staging commands; updated command helps

Show diffs side-by-side

added added

removed removed

lib/stdhome/program.py
59
59
                print("     --version  output version information and exit")
60
60
                print()
61
61
                print("Commands:")
62
 
                print("  init          initialise a local copy of your repositories")
63
 
                print("  update        update files in your home directory")
 
62
                print("  init          initialise a local copy of your repository")
 
63
                print("  update        merge remote changes in to your home directory")
64
64
                print("  resolve       try to finish an update (that had conflicts)")
65
65
                print("  add           add local files/changes to the repository")
66
 
#               print "  remove        remove a local file from the repository"
 
66
#               print("  remove        remove a local file from the repository")
67
67
                print("  status        list files that have changed locally")
68
68
                print("  diff          shows changes made to local files")
69
69
                print("  revert        undo changes made to local files")
70
 
#               print "  stage-add     add (but don't commit) files/changes to local repository"
71
 
#               print "  stage-remove  delete *but don't comit) files from the local repository"
 
70
                print()
 
71
                print("Manual staging commands:")
 
72
                print("  stage-add     add (but don't commit) files/changes to local repository")
 
73
#               print("  stage-remove  delete *but don't comit) files from the local repository")
72
74
                print("  stage-revert  revert changes in the local repository")
73
 
#               print "  stage-status  show status of local repository"
74
 
#               print "  stage-diff    shows changes in local repository"
75
 
#               print "  stage-commit  commit changes in the local repository"
 
75
#               print("  stage-status  show status of local repository")
 
76
#               print("  stage-diff    shows changes in local repository")
 
77
                print("  stage-commit  commit changes in the local repository")
76
78
                print()
77
79
                print("For help about a particular command (including the additional options that the")
78
80
                print("command accepts) try typing:")