← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to lib/fileservice_lib/action.py

  • Committer: wagrant
  • Date: 2008-07-21 04:56:00 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:919
fileservice_lib: Implement "svn resolved".
browser: Expose SVN resolution marking in the UI.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/fileservice_lib/action.py
556
556
    except pysvn.ClientError, e:
557
557
        raise ActionError(str(e))
558
558
 
 
559
def action_svnresolved(req, fields):
 
560
    """Performs a "svn resolved" to each file specified.
 
561
 
 
562
    Reads fields: 'path'
 
563
    """
 
564
    path = fields.getfirst('path')
 
565
    if path is None:
 
566
        raise ActionError("Required field missing")
 
567
    path = actionpath_to_local(req, path)
 
568
 
 
569
    try:
 
570
        svnclient.resolved(path, recurse=True)
 
571
    except pysvn.ClientError, e:
 
572
        raise ActionError(str(e))
 
573
 
559
574
def action_svnrevert(req, fields):
560
575
    """Performs a "svn revert" to each file specified.
561
576
 
655
670
 
656
671
    "svnadd" : action_svnadd,
657
672
    "svnupdate" : action_svnupdate,
 
673
    "svnresolved" : action_svnresolved,
658
674
    "svnrevert" : action_svnrevert,
659
675
    "svnpublish" : action_svnpublish,
660
676
    "svnunpublish" : action_svnunpublish,