patch

FlorentBecker :: Sun Apr 1 08:46:39 UTC 2012
Make darcs friendlier and more reliable
Darcs has long been the most user-friendly vcs, and very reliable. But let's not forget that a friend in need is a friend indeed. This patch introduces the --advice flag to a few commands. When you're in need of advice, this flag unleashes darcs' powers of compassion to give you the best personal advice for your situation.
Note: the behaviour -> messages database should be enriched.

summary

src/Darcs/Arguments.hsreplaced Personnalwith Personal
src/Darcs/Commands/Push.hs
src/Darcs/Commands/Record.hs
src/Darcs/Commands/WhatsNew.hs
src/Darcs/Flags.hsreplaced Personnalwith Personal
src/Darcs/SelectChanges.hs
src/Darcs/Flags.hs
src/Darcs/Commands/Revert.hs
src/Darcs/Commands/AmendRecord.hs
src/Darcs/Arguments.hsreplaced personnalwith personal
src/Darcs/Arguments.hs

changes

src/Darcs/Arguments.hs :: line 89

                         usePacks, recordRollback, amendUnrecord

                         usePacks, recordRollback, amendUnrecord, personnal

src/Darcs/Arguments.hs :: line 154
```
getContent Personnal = NoContent
```

src/Darcs/Arguments.hs :: line 1151

personnal :: DarcsOption
personnal = DarcsSingleOption $
            DarcsNoArgOption [] ["advice"] Personnal "give personnal advice"

src/Darcs/Commands/AmendRecord.hs :: line 50

                        , unified

                        , unified, personal

src/Darcs/Commands/AmendRecord.hs :: line 149
```
        , personal
```

src/Darcs/Commands/Push.hs :: line 26

import Darcs.Arguments ( DarcsFlag( DryRun, Sign, SignAs, NoSign, SignSSL ),

import Darcs.Arguments ( DarcsFlag( DryRun, Sign, SignAs, NoSign, SignSSL, Personal ),
                         personal,

src/Darcs/Commands/Push.hs :: line 35

                         changesReverse

                         changesReverse, personal

src/Darcs/Commands/Push.hs :: line 86

                                                 changesReverse] ++

                                                 changesReverse,
                                                 personal] ++

src/Darcs/Commands/Push.hs :: line 162

          putInfo opts $

        if Personal `elem` opts
          then putInfo opts $
               text "You don't want to push anything, that's very considerate"
          else putInfo opts $

src/Darcs/Commands/Push.hs :: line 167

          exitWith ExitSuccess

        exitWith ExitSuccess

src/Darcs/Commands/Record.hs :: line 64

                                    PatchName, AskDeps, All ),

                                    PatchName, AskDeps, All, Personal ),

src/Darcs/Commands/Record.hs :: line 73

                         , unified )

                         , unified, personal )

src/Darcs/Commands/Record.hs :: line 110

                                                   setScriptsExecutableOption],

                                                   setScriptsExecutableOption,
                                                   personal],

src/Darcs/Commands/Record.hs :: line 191

              do putStrLn "Ok, if you don't want to record anything, that's fine!"

              do if Personal `elem` opts
                   then
                    putStrLn "Better not record anything, they'd use it as evidence!"
                   else
                    putStrLn "Ok, if you don't want to record anything, that's fine!"

src/Darcs/Commands/Revert.hs :: line 28

import Darcs.Arguments ( DarcsFlag( All, Debug ),

import Darcs.Arguments ( DarcsFlag( All, Debug, Personal ),

src/Darcs/Commands/Revert.hs :: line 32

                        listRegisteredFiles, umaskOption, unified

                        listRegisteredFiles, umaskOption, unified,
                        personal

src/Darcs/Commands/Revert.hs :: line 113

  when Personal `elem` opts $
    putStrLn "rembember, forgiving would be better than forgetting"

src/Darcs/Commands/WhatsNew.hs :: line 35

                         fixSubPaths, listRegisteredFiles )

                         fixSubPaths, listRegisteredFiles, personal )

src/Darcs/Commands/WhatsNew.hs :: line 70

                        , commandAdvancedOptions = [ignoretimes, noskipBoring]

                        , commandAdvancedOptions = [ignoretimes, noskipBoring, personal]

src/Darcs/Commands/WhatsNew.hs :: line 149

    exitOnNoChanges (NilFL, NilFL) = do putStrLn "No changes!"
                                        exitWith $ ExitFailure 1

    exitOnNoChanges (NilFL, NilFL) | Personal `elem` opts =
      do putStrLn "Nothing new, maybe you should work on your patience"
         exitWith $ ExitFailure 1

    exitOnNoChanges (NilFL, NilFL) | otherwise = do putStrLn "No changes!"
                                                    exitWith $ ExitFailure 1

src/Darcs/Flags.hs :: line 141
```
               | Personnal
```

src/Darcs/SelectChanges.hs :: line 70

                              , SkipConflicts )

                              , SkipConflicts, Personal )

src/Darcs/SelectChanges.hs :: line 259

        Nothing ->
            putStrLn $ "Cancelling " ++ jn ++ " since no patch was selected."

        Nothing -> if Personal `elem` o && jn == "amend"
                   then
                     putStrLn $ "You don't want to amend anything, that's fine with be, but maybe you should learn to compromise."
                   else
                     putStrLn $ "Cancelling " ++ jn ++ " since no patch was selected."

darcsden :: kowey -> darcs-ux-2012-04 -> patch

patch

FlorentBecker :: Sun Apr 1 08:46:39 UTC 2012

summary

changes

src/Darcs/Arguments.hs :: line 89

src/Darcs/Arguments.hs :: line 154

src/Darcs/Arguments.hs :: line 1151

src/Darcs/Commands/AmendRecord.hs :: line 50

src/Darcs/Commands/AmendRecord.hs :: line 149

src/Darcs/Commands/Push.hs :: line 26

src/Darcs/Commands/Push.hs :: line 35

src/Darcs/Commands/Push.hs :: line 86

src/Darcs/Commands/Push.hs :: line 162

src/Darcs/Commands/Push.hs :: line 167

src/Darcs/Commands/Record.hs :: line 64

src/Darcs/Commands/Record.hs :: line 73

src/Darcs/Commands/Record.hs :: line 110

src/Darcs/Commands/Record.hs :: line 191

src/Darcs/Commands/Revert.hs :: line 28

src/Darcs/Commands/Revert.hs :: line 32

src/Darcs/Commands/Revert.hs :: line 113

src/Darcs/Commands/WhatsNew.hs :: line 35

src/Darcs/Commands/WhatsNew.hs :: line 70

src/Darcs/Commands/WhatsNew.hs :: line 149

src/Darcs/Flags.hs :: line 141

src/Darcs/SelectChanges.hs :: line 70

src/Darcs/SelectChanges.hs :: line 259